From 89421938cfc7a5c3a6fe380754c45037b025870f Mon Sep 17 00:00:00 2001 From: hhzzff <2070620600@qq.com> Date: Sat, 27 Apr 2024 00:31:53 +0800 Subject: [PATCH 01/11] feat: :sparkles: . --- .../Assets/Scenes/SampleScene.unity | 39 +++++++-- .../interface_live/Assets/Scripts/Debugger.cs | 83 +++++++++---------- .../Scripts/Define/Parameter/CoreParam.cs | 4 +- .../Assets/Scripts/Message/UpdateManager.cs | 1 + .../Assets/Scripts/Render/RenderManager.cs | 30 +++++-- 5 files changed, 100 insertions(+), 57 deletions(-) diff --git a/interface/interface_live/Assets/Scenes/SampleScene.unity b/interface/interface_live/Assets/Scenes/SampleScene.unity index 2e3ff10a..62e5f4d4 100644 --- a/interface/interface_live/Assets/Scenes/SampleScene.unity +++ b/interface/interface_live/Assets/Scenes/SampleScene.unity @@ -354,15 +354,36 @@ MonoBehaviour: - p: - {fileID: 1304984658260562521, guid: 693d92e1c7f9c6e4597faf934cdb42c0, type: 3} - {fileID: 2191818354525212035, guid: 4ad9c437da4f8d1468ea72a9be373c8b, type: 3} - - p: [] - - p: [] - - p: [] - - p: [] - - p: [] - - p: [] - shiplist: [] - bulletList: [] - constructionList: [] + - p: + - {fileID: 6520599987196359259, guid: acca4bed1be3e314191cd041b6718c5a, type: 3} + - p: + - {fileID: 73901610976941151, guid: c7b49a90d8bef8d46a4bce231bbd4bbc, type: 3} + - {fileID: 2076829689532050399, guid: 22ca1ac7000005944a2fb85b1ddb6e7f, type: 3} + - {fileID: 889495328777635882, guid: d7a44630d1355954f85ba41057cccb41, type: 3} + - p: + - {fileID: 2817536373982564735, guid: d43c88f52cfe70248899ea9ef8cfe8a2, type: 3} + - {fileID: 6689915564642265873, guid: 904adecf3b36a41439687b01ef339180, type: 3} + - {fileID: 667973134933400006, guid: 8787298c21a136d48a2b6956ab9c2277, type: 3} + - p: + - {fileID: 4461932328840788347, guid: df385eaebb177c244a8f6aa2fc2d05f2, type: 3} + - p: + - {fileID: 3284573290373744302, guid: 690965b65f8667d4299c13f7cb4dc444, type: 3} + - p: + - {fileID: 2487624789702488523, guid: 9ba3f57fff0f3f240aad67b489d717f2, type: 3} + shiplist: + - {fileID: 7171601645716739352, guid: 689388b1ed32205428711466f3794748, type: 3} + - {fileID: 1718981553063819522, guid: a69b4f22edee38141902bab64373c73d, type: 3} + - {fileID: 8427987949455047532, guid: 57d8c0b08e0f19f48a227b34b8b70a0b, type: 3} + bulletList: + - {fileID: 5236724725662676995, guid: ad4363c14d065c040bac11009ace5dc4, type: 3} + - {fileID: 7049118564761611801, guid: e0c55c5797964e045ad780dd1868169b, type: 3} + - {fileID: 5671706578558220722, guid: 9347cf63de3b0c242bac7ee29562d5dd, type: 3} + - {fileID: 6742644745694519620, guid: a2185ad8f0eb43249b555bda1913c662, type: 3} + - {fileID: 5671706578558220722, guid: afe69842439154b428512871bfc3db8a, type: 3} + constructionList: + - {fileID: 6257076823173944538, guid: f0f5b7271131c0f4b97b109570925eb9, type: 3} + - {fileID: 6520154078847335470, guid: 3ca3df56b82e8484ca02de1e96d8cef9, type: 3} + - {fileID: 8302654837601584078, guid: ab06c719504fda3449d4df06ab5693cc, type: 3} mapfa: {fileID: 0} --- !u!114 &689954760 MonoBehaviour: diff --git a/interface/interface_live/Assets/Scripts/Debugger.cs b/interface/interface_live/Assets/Scripts/Debugger.cs index c0aef565..4f55e477 100644 --- a/interface/interface_live/Assets/Scripts/Debugger.cs +++ b/interface/interface_live/Assets/Scripts/Debugger.cs @@ -15,51 +15,50 @@ public class Debugger : SingletonMono void Start() { - // messageOfShip = new MessageOfShip() - // { - // X = 1145, - // Y = 1919, - // Speed = 0, - // Hp = 0, - // Armor = 0, - // Shield = 0, - // TeamId = 0, - // PlayerId = 0, - // Guid = 0, - // ShipState = 0, - // ShipType = 0, - // ViewRange = 0, - // ProducerType = 0, - // ConstructorType = 0, - // ArmorType = 0, - // ShieldType = 0, - // WeaponType = 0, - // FacingDirection = 0.0 - // }; + messageOfShip = new MessageOfShip() + { + X = 1145, + Y = 1919, + Speed = 0, + Hp = 0, + Armor = 0, + Shield = 0, + TeamId = 0, + PlayerId = 1, + Guid = 0, + ShipState = 0, + ShipType = 0, + ViewRange = 0, + ProducerType = 0, + ConstructorType = 0, + ArmorType = 0, + ShieldType = 0, + WeaponType = 0, + FacingDirection = 0.0 + }; - // messageOfObj = new MessageOfObj() - // { - // ShipMessage = messageOfShip, - // }; + messageOfObj = new MessageOfObj() + { + ShipMessage = messageOfShip, + }; - // messageToClient = new MessageToClient(); - // messageOfAll = new MessageOfAll() - // { + messageToClient = new MessageToClient(); + messageOfAll = new MessageOfAll() + { - // GameTime = 1, - // RedTeamScore = 2, - // BlueTeamScore = 3, - // RedTeamEnergy = 4, - // BlueTeamEnergy = 5, - // RedHomeHp = 6, - // BlueHomeHp = 7, - // }; - // messageToClient.ObjMessage.Add(messageOfObj); - // messageToClient.GameState = GameState.GameRunning; - // messageToClient.AllMessage = messageOfAll; - // info = JsonConvert.SerializeObject(messageToClient); - // UpdateManager.GetInstance().UpdateMessageByJson(info); - // info = System.IO.File.ReadAllText(@"D:\SoftwareDepartment\THUAI7\THUAI7\interface\interface_live\Assets\frame.json"); + GameTime = 1, + RedTeamScore = 2, + BlueTeamScore = 3, + RedTeamEnergy = 4, + BlueTeamEnergy = 5, + RedHomeHp = 6, + BlueHomeHp = 7, + }; + messageToClient.ObjMessage.Add(messageOfObj); + messageToClient.GameState = GameState.GameRunning; + messageToClient.AllMessage = messageOfAll; + info = JsonConvert.SerializeObject(messageToClient); + UpdateManager.GetInstance().UpdateMessageByJson(info); } diff --git a/interface/interface_live/Assets/Scripts/Define/Parameter/CoreParam.cs b/interface/interface_live/Assets/Scripts/Define/Parameter/CoreParam.cs index 4a48289f..80775e2b 100644 --- a/interface/interface_live/Assets/Scripts/Define/Parameter/CoreParam.cs +++ b/interface/interface_live/Assets/Scripts/Define/Parameter/CoreParam.cs @@ -29,15 +29,17 @@ public T GetValue(int index) return valQueue[(tail + maxSize - index) % maxSize]; } }; - public static FrameQueue frameQueue; + public static FrameQueue frameQueue = new FrameQueue(); public static MessageOfMap map; public static Dictionary, MessageOfResource> resources; public static MessageOfHome[] homes = new MessageOfHome[2]; public static MessageOfTeam[] teams = new MessageOfTeam[2]; public static MessageOfShip[] ships = new MessageOfShip[8]; + public static GameObject[] shipsG = new GameObject[8]; public static Dictionary bullets; public static Dictionary bombedBullets; public static List factories; public static List communities; public static List forts; + public static bool initialized; } diff --git a/interface/interface_live/Assets/Scripts/Message/UpdateManager.cs b/interface/interface_live/Assets/Scripts/Message/UpdateManager.cs index 8e186bd5..e8c18d25 100644 --- a/interface/interface_live/Assets/Scripts/Message/UpdateManager.cs +++ b/interface/interface_live/Assets/Scripts/Message/UpdateManager.cs @@ -14,6 +14,7 @@ public void UpdateMessageByJson(string jsonInfo) { // Debugger.GetInstance().text.text = jsonInfo; CoreParam.frameQueue.Add(JsonConvert.DeserializeObject(jsonInfo, jSetting)); + Debug.Log(CoreParam.frameQueue.GetValue(0)); } // Start is called before the first frame update void Start() diff --git a/interface/interface_live/Assets/Scripts/Render/RenderManager.cs b/interface/interface_live/Assets/Scripts/Render/RenderManager.cs index 36d14802..3ef116d6 100644 --- a/interface/interface_live/Assets/Scripts/Render/RenderManager.cs +++ b/interface/interface_live/Assets/Scripts/Render/RenderManager.cs @@ -14,19 +14,20 @@ void Start() // Update is called once per frame void Update() { - + DealFrame(CoreParam.frameQueue.GetValue(0)); + ShowFrame(); } - void ShowFrame(MessageToClient info) + void DealFrame(MessageToClient info) { if (info.GameState == GameState.GameRunning) { foreach (MessageOfObj obj in info.ObjMessage) { - ShowObj(obj); + DealObj(obj); } } } - void ShowObj(MessageOfObj obj) + void DealObj(MessageOfObj obj) { switch (obj.MessageOfObjCase) { @@ -34,6 +35,7 @@ void ShowObj(MessageOfObj obj) CoreParam.map = obj.MapMessage; break; case MessageOfObj.MessageOfObjOneofCase.ShipMessage: + Debug.Log("receive shipmessage" + obj.ShipMessage); CoreParam.ships[obj.ShipMessage.TeamId * 4 + obj.ShipMessage.PlayerId] = obj.ShipMessage; break; case MessageOfObj.MessageOfObjOneofCase.BulletMessage: @@ -65,6 +67,15 @@ void ShowObj(MessageOfObj obj) break; } } + void ShowFrame() + { + if (!CoreParam.initialized) + { + ShowShip(CoreParam.ships); + ShowMap(CoreParam.map); + CoreParam.initialized = true; + } + } void ShowMap(MessageOfMap map) { for (int row = 1; row <= map.Height; row++) @@ -96,7 +107,16 @@ void ShowMap(MessageOfMap map) } } } - void ShowShip(MessageOfShip ship) + void ShowShip(MessageOfShip[] ships) { + foreach (MessageOfShip ship in ships) + { + Debug.Log(ship); + if (!CoreParam.shipsG[ship.TeamId * 4 + ship.PlayerId]) + { + CoreParam.shipsG[ship.TeamId * 4 + ship.PlayerId] = ObjCreater.GetInstance().CreateObj(ship.ShipType, new Vector2(ship.X, ship.Y)); + + } + } } } From d0e4864373fe31400c5d1754690a97ccd321cca3 Mon Sep 17 00:00:00 2001 From: sigureling <1678348940@qq.com> Date: Sat, 11 May 2024 23:15:57 +0800 Subject: [PATCH 02/11] fix: :sparkles: Add RepairHome and RepairWormhole --- CAPI/cpp/API/include/API.h | 8 ++++++ CAPI/cpp/API/include/Communication.h | 2 ++ CAPI/cpp/API/include/logic.h | 2 ++ CAPI/cpp/API/src/API.cpp | 12 +++++++++ CAPI/cpp/API/src/Communication.cpp | 38 ++++++++++++++++++++++++++++ CAPI/cpp/API/src/DebugAPI.cpp | 21 +++++++++++++++ CAPI/cpp/API/src/logic.cpp | 12 +++++++++ CAPI/python/PyAPI/API.py | 6 +++++ CAPI/python/PyAPI/Communication.py | 28 ++++++++++++++++++++ CAPI/python/PyAPI/DebugAPI.py | 38 ++++++++++++++++++++++++++-- CAPI/python/PyAPI/Interface.py | 30 +++++++++++++++++++++- CAPI/python/PyAPI/logic.py | 8 ++++++ dependency/proto/Services.proto | 3 +++ logic/Server/RpcServices.cs | 32 +++++++++++++++++++++++ 14 files changed, 237 insertions(+), 3 deletions(-) diff --git a/CAPI/cpp/API/include/API.h b/CAPI/cpp/API/include/API.h index 5c6c463a..10cc295d 100755 --- a/CAPI/cpp/API/include/API.h +++ b/CAPI/cpp/API/include/API.h @@ -64,6 +64,8 @@ class ILogic virtual bool Move(int64_t time, double angle) = 0; virtual bool Recover(int64_t recover) = 0; virtual bool Produce() = 0; + virtual bool RepairWormhole() = 0; + virtual bool RepairHome() = 0; virtual bool Rebuild(THUAI7::ConstructionType constructionType) = 0; virtual bool Construct(THUAI7::ConstructionType constructionType) = 0; virtual bool Attack(double angle) = 0; @@ -139,6 +141,8 @@ class IShipAPI : public IAPI virtual std::future Attack(double angleInRadian) = 0; virtual std::future Recover(int64_t recover) = 0; virtual std::future Produce() = 0; + virtual std::future RepairWormhole() = 0; + virtual std::future RepairHome() = 0; virtual std::future Rebuild(THUAI7::ConstructionType constructionType) = 0; virtual std::future Construct(THUAI7::ConstructionType constructionType) = 0; virtual std::shared_ptr GetSelfInfo() const = 0; @@ -195,6 +199,8 @@ class ShipAPI : public IShipAPI, public IGameTimer std::future Attack(double angleInRadian) override; std::future Recover(int64_t recover) override; std::future Produce() override; + std::future RepairWormhole() override; + std::future RepairHome() override; std::future Rebuild(THUAI7::ConstructionType constructionType) override; std::future Construct(THUAI7::ConstructionType constructionType) override; @@ -312,6 +318,8 @@ class ShipDebugAPI : public IShipAPI, public IGameTimer std::future Attack(double angleInRadian) override; std::future Recover(int64_t recover) override; std::future Produce() override; + std::future RepairWormhole() override; + std::future RepairHome() override; std::future Rebuild(THUAI7::ConstructionType constructionType) override; std::future Construct(THUAI7::ConstructionType constructionType) override; diff --git a/CAPI/cpp/API/include/Communication.h b/CAPI/cpp/API/include/Communication.h index 96a846b7..8ab441f8 100755 --- a/CAPI/cpp/API/include/Communication.h +++ b/CAPI/cpp/API/include/Communication.h @@ -35,6 +35,8 @@ class Communication bool Move(int32_t playerID, int32_t teamID, int64_t time, double angle); bool Recover(int32_t playerID, int64_t recover, int32_t teamID); bool Produce(int32_t playerID, int32_t teamID); + bool RepairWormhole(int32_t playerID, int32_t teamID); + bool RepairHome(int32_t playerID, int32_t teamID); bool Rebuild(int32_t playerID, int32_t teamID, THUAI7::ConstructionType constructionType); bool Construct(int32_t playerID, int32_t teamID, THUAI7::ConstructionType constructionType); bool Attack(int32_t playerID, int32_t teamID, double angle); diff --git a/CAPI/cpp/API/include/logic.h b/CAPI/cpp/API/include/logic.h index cd1df973..a64c8446 100755 --- a/CAPI/cpp/API/include/logic.h +++ b/CAPI/cpp/API/include/logic.h @@ -117,6 +117,8 @@ class Logic : public ILogic bool Move(int64_t time, double angle); bool Recover(int64_t recover); bool Produce(); + bool RepairWormhole(); + bool RepairHome(); bool Rebuild(THUAI7::ConstructionType constructionType); bool Construct(THUAI7::ConstructionType constructionType); bool Attack(double angle); diff --git a/CAPI/cpp/API/src/API.cpp b/CAPI/cpp/API/src/API.cpp index 0059658d..8ede7fd6 100755 --- a/CAPI/cpp/API/src/API.cpp +++ b/CAPI/cpp/API/src/API.cpp @@ -275,6 +275,18 @@ std::future ShipAPI::Produce() { return logic.Produce(); }); } +std::future ShipAPI::RepairWormhole() +{ + return std::async(std::launch::async, [=]() + { return logic.RepairWormhole(); }); +} + +std::future ShipAPI::RepairHome() +{ + return std::async(std::launch::async, [=]() + { return logic.RepairHome(); }); +} + std::future ShipAPI::Rebuild(THUAI7::ConstructionType constructionType) { return std::async(std::launch::async, [=]() diff --git a/CAPI/cpp/API/src/Communication.cpp b/CAPI/cpp/API/src/Communication.cpp index 6c86b7eb..1c68e8da 100755 --- a/CAPI/cpp/API/src/Communication.cpp +++ b/CAPI/cpp/API/src/Communication.cpp @@ -114,6 +114,44 @@ bool Communication::Produce(int32_t playerID, int32_t teamID) return false; } +bool Communication::RepairWormhole(int32_t playerID, int32_t teamID) +{ + { + std::lock_guard lock(mtxLimit); + if (counter >= limit || counterMove >= moveLimit) + return false; + counter++; + counterMove++; + } + protobuf::BoolRes repairWormholeResult; + ClientContext context; + auto request = THUAI72Proto::THUAI72ProtobufIDMsg(playerID, teamID); + auto status = THUAI7Stub->RepairWormhole(&context, request, &repairWormholeResult); + if (status.ok()) + return repairWormholeResult.act_success(); + else + return false; +} + +bool Communication::RepairHome(int32_t playerID, int32_t teamID) +{ + { + std::lock_guard lock(mtxLimit); + if (counter >= limit || counterMove >= moveLimit) + return false; + counter++; + counterMove++; + } + protobuf::BoolRes repairHomeResult; + ClientContext context; + auto request = THUAI72Proto::THUAI72ProtobufIDMsg(playerID, teamID); + auto status = THUAI7Stub->RepairHome(&context, request, &repairHomeResult); + if (status.ok()) + return repairHomeResult.act_success(); + else + return false; +} + bool Communication::Rebuild(int32_t playerID, int32_t teamID, THUAI7::ConstructionType constructionType) { { diff --git a/CAPI/cpp/API/src/DebugAPI.cpp b/CAPI/cpp/API/src/DebugAPI.cpp index c2641e32..bb9eccf1 100755 --- a/CAPI/cpp/API/src/DebugAPI.cpp +++ b/CAPI/cpp/API/src/DebugAPI.cpp @@ -156,6 +156,27 @@ std::future ShipDebugAPI::Produce() logger->warn("Produce: failed at {}ms",Time::TimeSinceStart(startPoint)); return result; }); } + +std::future ShipDebugAPI::RepairWormhole() +{ + logger->info("RepairWormhole: called at {}ms", Time::TimeSinceStart(startPoint)); + return std::async(std::launch::async, [=]() + { auto result= logic.RepairWormhole(); + if(!result) + logger->warn("RepairWormhole: failed at {}ms",Time::TimeSinceStart(startPoint)); + return result; }); +} + +std::future ShipDebugAPI::RepairHome() +{ + logger->info("RepairHome: called at {}ms", Time::TimeSinceStart(startPoint)); + return std::async(std::launch::async, [=]() + { auto result= logic.RepairHome(); + if(!result) + logger->warn("RepairHome: failed at {}ms",Time::TimeSinceStart(startPoint)); + return result; }); +} + std::future ShipDebugAPI::Rebuild(THUAI7::ConstructionType constructionType) { logger->info("Rebuild: rebuilding {}, called at {}ms", THUAI7::constructionDict[constructionType], Time::TimeSinceStart(startPoint)); diff --git a/CAPI/cpp/API/src/logic.cpp b/CAPI/cpp/API/src/logic.cpp index 050b0325..1c73ca58 100755 --- a/CAPI/cpp/API/src/logic.cpp +++ b/CAPI/cpp/API/src/logic.cpp @@ -261,6 +261,18 @@ bool Logic::Produce() return pComm->Produce(playerID, teamID); } +bool Logic::RepairWormhole() +{ + logger->debug("Called RepairWormhole"); + return pComm->RepairWormhole(playerID, teamID); +} + +bool Logic::RepairHome() +{ + logger->debug("Called RepairHome"); + return pComm->RepairHome(playerID, teamID); +} + bool Logic::Rebuild(THUAI7::ConstructionType constructionType) { logger->debug("Called Rebuild"); diff --git a/CAPI/python/PyAPI/API.py b/CAPI/python/PyAPI/API.py index 2a2a2375..176954e9 100644 --- a/CAPI/python/PyAPI/API.py +++ b/CAPI/python/PyAPI/API.py @@ -34,6 +34,12 @@ def Recover(self, recover: int) -> Future[bool]: def Produce(self) -> Future[bool]: return self.__pool.submit(self.__logic.Produce) + def RepairWormhole(self) -> Future[bool]: + return self.__pool.submit(self.__logic.RepairWormhole) + + def RepairHome(self) -> Future[bool]: + return self.__pool.submit(self.__logic.RepairHome) + def Rebuild(self, constructionType: THUAI7.ConstructionType) -> Future[bool]: return self.__pool.submit(self.__logic.Rebuild, constructionType) diff --git a/CAPI/python/PyAPI/Communication.py b/CAPI/python/PyAPI/Communication.py index 8f49aa39..13311490 100644 --- a/CAPI/python/PyAPI/Communication.py +++ b/CAPI/python/PyAPI/Communication.py @@ -112,6 +112,34 @@ def Produce(self, playerID: int, teamID: int) -> bool: else: return produceResult.act_success + def RepairWormhole(self, playerID: int, teamID: int) -> bool: + try: + with self.__mtxLimit: + if self.__counter >= self.__limit: + return False + self.__counter += 1 + produceResult: Message2Clients.BoolRes = self.__THUAI7Stub.RepairWormhole( + THUAI72Proto.THUAI72ProtobufIDMsg(playerID, teamID) + ) + except grpc.RpcError: + return False + else: + return produceResult.act_success + + def RepairHome(self, playerID: int, teamID: int) -> bool: + try: + with self.__mtxLimit: + if self.__counter >= self.__limit: + return False + self.__counter += 1 + produceResult: Message2Clients.BoolRes = self.__THUAI7Stub.RepairHome( + THUAI72Proto.THUAI72ProtobufIDMsg(playerID, teamID) + ) + except grpc.RpcError: + return False + else: + return produceResult.act_success + def Rebuild( self, constructionType: THUAI7.ConstructionType, playerID: int, teamID: int ) -> bool: diff --git a/CAPI/python/PyAPI/DebugAPI.py b/CAPI/python/PyAPI/DebugAPI.py index 820f0daf..536714c9 100644 --- a/CAPI/python/PyAPI/DebugAPI.py +++ b/CAPI/python/PyAPI/DebugAPI.py @@ -10,7 +10,13 @@ class ShipDebugAPI(IShipAPI, IGameTimer): def __init__( - self, logic: ILogic, file: bool, screen: bool, warnOnly: bool, playerID: int, teamID: int + self, + logic: ILogic, + file: bool, + screen: bool, + warnOnly: bool, + playerID: int, + teamID: int, ) -> None: self.__logic = logic self.__pool = ThreadPoolExecutor(20) @@ -106,6 +112,28 @@ def logProduce() -> bool: return self.__pool.submit(logProduce) + def RepairWormhole(self) -> Future[bool]: + self.__logger.info(f"RepairWormhole: called at {self.__GetTime()}ms") + + def logRepairWormhole() -> bool: + result = self.__logic.RepairWormhole() + if not result: + self.__logger.warning(f"RepairWormhole failed at {self.__GetTime()}ms") + return result + + return self.__pool.submit(logRepairWormhole) + + def RepairHome(self) -> Future[bool]: + self.__logger.info(f"RepairHome: called at {self.__GetTime()}ms") + + def logRepairHome() -> bool: + result = self.__logic.RepairHome() + if not result: + self.__logger.warning(f"RepairHome failed at {self.__GetTime()}ms") + return result + + return self.__pool.submit(logRepairHome) + def Rebuild(self, constructionType: THUAI7.ConstructionType) -> Future[bool]: self.__logger.info( f"Rebuild: called at {self.__GetTime()}ms construction type {constructionType}" @@ -300,7 +328,13 @@ def Play(self, ai: IAI) -> None: class TeamDebugAPI(ITeamAPI, IGameTimer): def __init__( - self, logic: ILogic, file: bool, screen: bool, warnOnly: bool, playerID: int, teamID: int + self, + logic: ILogic, + file: bool, + screen: bool, + warnOnly: bool, + playerID: int, + teamID: int, ) -> None: self.__logic = logic self.__pool = ThreadPoolExecutor(20) diff --git a/CAPI/python/PyAPI/Interface.py b/CAPI/python/PyAPI/Interface.py index ca381a70..3cac021a 100644 --- a/CAPI/python/PyAPI/Interface.py +++ b/CAPI/python/PyAPI/Interface.py @@ -110,6 +110,14 @@ def Rebuild(self, constructionType: THUAI7.ConstructionType) -> bool: def Construct(self, constructionType: THUAI7.ConstructionType) -> bool: pass + @abstractmethod + def RepairHome(self) -> bool: + pass + + @abstractmethod + def RepairWormhole(self) -> bool: + pass + @abstractmethod def Attack(self, angle: float) -> bool: pass @@ -416,6 +424,24 @@ def Rebuild(self, constructionType: THUAI7.ConstructionType) -> Future[bool]: """ pass + @abstractmethod + def RepairWormhole(self) -> Future[bool]: + """发出修复虫洞指令 + - 需要接近待建造的 `Wormhole` + + :return: 是否成功进入修复虫洞状态，通过`.result()`方法等待获取`bool` + """ + pass + + @abstractmethod + def RepairHome(self) -> Future[bool]: + """发出修复大本营指令 + - 需要接近待建造的 `Home` + + :return: 是否成功进入修复大本营状态，通过`.result()`方法等待获取`bool` + """ + pass + @abstractmethod def Construct(self, constructionType: THUAI7.ConstructionType) -> Future[bool]: """发出建造指令 @@ -455,7 +481,9 @@ def GetSelfInfo(self) -> THUAI7.Team: pass @abstractmethod - def InstallModule(self, playerID: int, moduleType: THUAI7.ModuleType) -> Future[bool]: + def InstallModule( + self, playerID: int, moduleType: THUAI7.ModuleType + ) -> Future[bool]: """安装模块 :param playerID: 待安装模块的舰船编号 diff --git a/CAPI/python/PyAPI/logic.py b/CAPI/python/PyAPI/logic.py index 4fbb56ad..d0260440 100644 --- a/CAPI/python/PyAPI/logic.py +++ b/CAPI/python/PyAPI/logic.py @@ -235,6 +235,14 @@ def Produce(self) -> bool: self.__logger.debug("Called Produce") return self.__comm.Produce(self.__playerID, self.__teamID) + def RepairWormhole(self) -> bool: + self.__logger.debug("Called RepairWormhole") + return self.__comm.RepairWormhole(self.__playerID, self.__teamID) + + def RepairHome(self) -> bool: + self.__logger.debug("Called RepairHome") + return self.__comm.RepairHome(self.__playerID, self.__teamID) + def Rebuild(self, constructionType: THUAI7.ConstructionType) -> bool: self.__logger.debug("Called Rebuild") return self.__comm.Rebuild(constructionType, self.__playerID, self.__teamID) diff --git a/dependency/proto/Services.proto b/dependency/proto/Services.proto index dbc18505..544fecf2 100755 --- a/dependency/proto/Services.proto +++ b/dependency/proto/Services.proto @@ -19,6 +19,9 @@ service AvailableService rpc Construct(ConstructMsg) returns (BoolRes); // 修建建筑 rpc Attack(AttackMsg) returns (BoolRes); // 攻击 rpc Send(SendMsg) returns (BoolRes); // 传递信息 + rpc RepairHome(IDMsg) returns (BoolRes); // 修理大本营 + rpc RepairWormhole(IDMsg) returns (BoolRes); // 修理虫洞 + // 大本营 rpc InstallModule(InstallMsg) returns (BoolRes); rpc Recycle(IDMsg) returns (BoolRes); diff --git a/logic/Server/RpcServices.cs b/logic/Server/RpcServices.cs index 2b8d21d8..fcc01047 100755 --- a/logic/Server/RpcServices.cs +++ b/logic/Server/RpcServices.cs @@ -298,6 +298,38 @@ public override Task Produce(IDMsg request, ServerCallContext context) return Task.FromResult(boolRes); } + public override Task RepairHome(IDMsg request, ServerCallContext context) + { + GameServerLogging.logger.ConsoleLogDebug( + $"TRY RepairHome: Player {request.PlayerId} from Team {request.TeamId}"); + BoolRes boolRes = new(); + if (request.PlayerId >= spectatorMinPlayerID) + { + boolRes.ActSuccess = false; + return Task.FromResult(boolRes); + } + // var gameID = communicationToGameID[request.TeamId][request.PlayerId]; + boolRes.ActSuccess = game.RepairHome(request.TeamId, request.PlayerId); + GameServerLogging.logger.ConsoleLogDebug("END RepairHome"); + return Task.FromResult(boolRes); + } + + public override Task RepairWormhole(IDMsg request, ServerCallContext context) + { + GameServerLogging.logger.ConsoleLogDebug( + $"TRY RepairWormhole: Player {request.PlayerId} from Team {request.TeamId}"); + BoolRes boolRes = new(); + if (request.PlayerId >= spectatorMinPlayerID) + { + boolRes.ActSuccess = false; + return Task.FromResult(boolRes); + } + // var gameID = communicationToGameID[request.TeamId][request.PlayerId]; + boolRes.ActSuccess = game.RepairWormhole(request.TeamId, request.PlayerId); + GameServerLogging.logger.ConsoleLogDebug("END RepairWormhole"); + return Task.FromResult(boolRes); + } + public override Task Rebuild(ConstructMsg request, ServerCallContext context) { GameServerLogging.logger.ConsoleLogDebug( From dd1d7b70dba871e859b2cd9fe642e27fed1cb9d9 Mon Sep 17 00:00:00 2001 From: hhzzff <2070620600@qq.com> Date: Wed, 15 May 2024 16:41:25 +0800 Subject: [PATCH 03/11] feat: :sparkles: updated live --- .../interface_live/Assets/Prefabs/Base.prefab | 55 +- .../Assets/Prefabs/afflict_civilship3.prefab | 54 -- .../Assets/Prefabs/asteroid1.prefab | 4 +- .../Assets/Prefabs/asteroid2.prefab | 4 +- .../Assets/Prefabs/asteroid3.prefab | 4 +- .../Assets/Prefabs/community.prefab | 4 +- .../Assets/Prefabs/construction.prefab | 4 +- .../Prefabs/disperse_militaryship3.prefab | 56 -- .../Assets/Prefabs/factory.prefab | 4 +- .../Prefabs/foreshadow_flagship3.prefab | 57 -- .../Assets/Prefabs/resourceA1.prefab | 4 +- .../Assets/Prefabs/resourceB1.prefab | 4 +- .../Assets/Prefabs/resourceC1.prefab | 4 +- .../Assets/Prefabs/ruin1.prefab | 4 +- .../Assets/Prefabs/ruin2.prefab | 4 +- .../Assets/Prefabs/shadow.prefab | 4 +- .../Assets/Prefabs/space.prefab | 4 +- .../Assets/Prefabs/wormhole.prefab | 4 +- .../Assets/Scenes/SampleScene.unity | 708 ++++++++++++++---- .../SampleScene/Global Volume Profile.asset | 4 +- .../interface_live/Assets/Scripts/Camera.meta | 8 + .../Assets/Scripts/Camera/CameraControl.cs | 78 ++ .../Scripts/Camera/CameraControl.cs.meta | 11 + .../interface_live/Assets/Scripts/Debugger.cs | 172 ++++- .../Assets/Scripts/Define/Message2Clients.cs | 645 +++------------- .../Scripts/Define/Message2ClientsGrpc.cs | 0 .../Define/Message2ClientsGrpc.cs.meta | 11 + .../Assets/Scripts/Define/Message2Server.cs | 251 +------ .../Scripts/Define/Message2ServerGrpc.cs | 0 .../Scripts/Define/Message2ServerGrpc.cs.meta | 11 + .../Assets/Scripts/Define/MessageType.cs | 2 +- .../Assets/Scripts/Define/MessageTypeGrpc.cs | 0 .../Scripts/Define/MessageTypeGrpc.cs.meta | 11 + .../Scripts/Define/Parameter/CoreParam.cs | 69 +- .../Assets/Scripts/Message/UpdateManager.cs | 13 +- .../Assets/Scripts/ParaDefine.cs | 38 + .../Assets/Scripts/ParaDefine.cs.meta | 11 + .../Assets/Scripts/PlayerControl.cs | 175 +++++ .../Assets/Scripts/PlayerControl.cs.meta | 11 + .../Assets/Scripts/Render/RenderManager.cs | 290 ++++++- .../Assets/Scripts/Render/Tool.cs | 8 + .../Assets/Scripts/RendererControl.cs | 129 ++++ .../Assets/Scripts/RendererControl.cs.meta | 11 + .../interface_live/Assets/message(1).json | 1 + .../Assets/message(1).json.meta | 7 + interface/interface_live/Assets/message.json | 358 +++++++++ .../interface_live/Assets/message.json.meta | 7 + interface/interface_live/Assets/message2.json | 336 +++++++++ .../interface_live/Assets/message2.json.meta | 7 + .../ProjectSettings/TagManager.asset | 9 +- 50 files changed, 2401 insertions(+), 1269 deletions(-) create mode 100644 interface/interface_live/Assets/Scripts/Camera.meta create mode 100644 interface/interface_live/Assets/Scripts/Camera/CameraControl.cs create mode 100644 interface/interface_live/Assets/Scripts/Camera/CameraControl.cs.meta create mode 100644 interface/interface_live/Assets/Scripts/Define/Message2ClientsGrpc.cs create mode 100644 interface/interface_live/Assets/Scripts/Define/Message2ClientsGrpc.cs.meta create mode 100644 interface/interface_live/Assets/Scripts/Define/Message2ServerGrpc.cs create mode 100644 interface/interface_live/Assets/Scripts/Define/Message2ServerGrpc.cs.meta create mode 100644 interface/interface_live/Assets/Scripts/Define/MessageTypeGrpc.cs create mode 100644 interface/interface_live/Assets/Scripts/Define/MessageTypeGrpc.cs.meta create mode 100644 interface/interface_live/Assets/Scripts/ParaDefine.cs create mode 100644 interface/interface_live/Assets/Scripts/ParaDefine.cs.meta create mode 100644 interface/interface_live/Assets/Scripts/PlayerControl.cs create mode 100644 interface/interface_live/Assets/Scripts/PlayerControl.cs.meta create mode 100644 interface/interface_live/Assets/Scripts/RendererControl.cs create mode 100644 interface/interface_live/Assets/Scripts/RendererControl.cs.meta create mode 100644 interface/interface_live/Assets/message(1).json create mode 100644 interface/interface_live/Assets/message(1).json.meta create mode 100644 interface/interface_live/Assets/message.json create mode 100644 interface/interface_live/Assets/message.json.meta create mode 100644 interface/interface_live/Assets/message2.json create mode 100644 interface/interface_live/Assets/message2.json.meta diff --git a/interface/interface_live/Assets/Prefabs/Base.prefab b/interface/interface_live/Assets/Prefabs/Base.prefab index 4264c11d..757bd956 100644 --- a/interface/interface_live/Assets/Prefabs/Base.prefab +++ b/interface/interface_live/Assets/Prefabs/Base.prefab @@ -10,8 +10,6 @@ GameObject: m_Component: - component: {fileID: 2343335082935178983} - component: {fileID: 2633087526931125268} - - component: {fileID: 185038739592644713} - - component: {fileID: 3858766104968319131} - component: {fileID: 791497468914672102} m_Layer: 6 m_Name: Base @@ -77,7 +75,7 @@ SpriteRenderer: m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} m_SortingLayerID: -1026933429 - m_SortingLayer: -1 + m_SortingLayer: 0 m_SortingOrder: 0 m_Sprite: {fileID: -452132711, guid: 8d794b099727c684aa35073dfebec3ae, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} @@ -90,57 +88,6 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 ---- !u!114 &185038739592644713 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2487624789702488523} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 33624e7926488114892585bc69105bab, type: 3} - m_Name: - m_EditorClassIdentifier: - interactBase: {fileID: 0} - generatePos: - - {x: -2.003803e+15, y: 6.99e-43} - - {x: 0.000042965818, y: 0.00000016502315} - messageOfBase: - x: 0 - y: 0 - hp: 24000 - economy: 0 - playerTeam: 0 - shipNum: - civilShipNum: 0 - militaryShipNum: 0 - flagShipNum: 0 - shipTotalNum: 0 - obj: {fileID: 0} ---- !u!114 &3858766104968319131 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2487624789702488523} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 515cf190256e2214ea5daad3164a90b3, type: 3} - m_Name: - m_EditorClassIdentifier: - interactType: 1 - interactOption: 0 - tobeSelected: 0 - selected: 0 - selectedSign: {fileID: 2362405429118444927, guid: d5b0673cd77cb7f43b9b1df36ceb2520, type: 3} - tobeSelectedSign: {fileID: 5230180300230231966, guid: c35172cad03b3784c93db13d884b4bbc, type: 3} - tobeseObj: {fileID: 0} - seObj: {fileID: 0} - moveOption: {x: 0, y: 0} - attackOption: {x: 0, y: 0} - enableMove: 0 --- !u!61 &791497468914672102 BoxCollider2D: m_ObjectHideFlags: 0 diff --git a/interface/interface_live/Assets/Prefabs/afflict_civilship3.prefab b/interface/interface_live/Assets/Prefabs/afflict_civilship3.prefab index 8433eb85..cbd037e8 100644 --- a/interface/interface_live/Assets/Prefabs/afflict_civilship3.prefab +++ b/interface/interface_live/Assets/Prefabs/afflict_civilship3.prefab @@ -179,7 +179,6 @@ GameObject: - component: {fileID: 3612929307087270911} - component: {fileID: 6770427568174600179} - component: {fileID: -4359886877623418897} - - component: {fileID: 5830000981015486441} m_Layer: 6 m_Name: afflict_civilship3 m_TagString: Ship @@ -283,56 +282,3 @@ Rigidbody2D: m_SleepingMode: 1 m_CollisionDetection: 1 m_Constraints: 4 ---- !u!60 &5830000981015486441 -PolygonCollider2D: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7171601645716739352} - m_Enabled: 1 - m_Density: 1 - m_Material: {fileID: 0} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_LayerOverridePriority: 0 - m_ForceSendLayers: - serializedVersion: 2 - m_Bits: 4294967295 - m_ForceReceiveLayers: - serializedVersion: 2 - m_Bits: 4294967295 - m_ContactCaptureLayers: - serializedVersion: 2 - m_Bits: 4294967295 - m_CallbackLayers: - serializedVersion: 2 - m_Bits: 4294967295 - m_IsTrigger: 0 - m_UsedByEffector: 0 - m_UsedByComposite: 0 - m_Offset: {x: 0, y: 0} - m_SpriteTilingProperty: - border: {x: 0, y: 0, z: 0, w: 0} - pivot: {x: 0.5, y: 0.5} - oldSize: {x: 1.4222223, y: 1.4222223} - newSize: {x: 1.4222223, y: 1.4222223} - adaptiveTilingThreshold: 0.5 - drawMode: 0 - adaptiveTiling: 0 - m_AutoTiling: 0 - m_Points: - m_Paths: - - - {x: -0.65203804, y: -0.2703777} - - {x: -0.20493068, y: -0.688784} - - {x: 0.21247491, y: -0.6915976} - - {x: 0.6544107, y: -0.26316732} - - {x: 0.49007905, y: 0.24612868} - - {x: 0.10974354, y: 0.6245806} - - {x: -0.11176881, y: 0.6241703} - - {x: -0.4908295, y: 0.24613677} - m_UseDelaunayMesh: 0 diff --git a/interface/interface_live/Assets/Prefabs/asteroid1.prefab b/interface/interface_live/Assets/Prefabs/asteroid1.prefab index 35244f13..87f5854e 100644 --- a/interface/interface_live/Assets/Prefabs/asteroid1.prefab +++ b/interface/interface_live/Assets/Prefabs/asteroid1.prefab @@ -27,7 +27,7 @@ Transform: m_GameObject: {fileID: 73901610976941151} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 1.31, y: -3.26, z: 0} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -71,7 +71,7 @@ SpriteRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} - m_SortingLayerID: -1026933429 + m_SortingLayerID: 1016154807 m_SortingLayer: -1 m_SortingOrder: 0 m_Sprite: {fileID: 21300000, guid: ca8591645aa5c1b42be3a00db68050e4, type: 3} diff --git a/interface/interface_live/Assets/Prefabs/asteroid2.prefab b/interface/interface_live/Assets/Prefabs/asteroid2.prefab index 7b159838..f2e861db 100644 --- a/interface/interface_live/Assets/Prefabs/asteroid2.prefab +++ b/interface/interface_live/Assets/Prefabs/asteroid2.prefab @@ -27,7 +27,7 @@ Transform: m_GameObject: {fileID: 2076829689532050399} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -3.1050818, y: -3.35494, z: 0} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -71,7 +71,7 @@ SpriteRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} - m_SortingLayerID: -1026933429 + m_SortingLayerID: 1016154807 m_SortingLayer: -1 m_SortingOrder: 0 m_Sprite: {fileID: 21300000, guid: bfbebd03ad1eba94d97d36f4a8379755, type: 3} diff --git a/interface/interface_live/Assets/Prefabs/asteroid3.prefab b/interface/interface_live/Assets/Prefabs/asteroid3.prefab index a3809ae3..c124ba70 100644 --- a/interface/interface_live/Assets/Prefabs/asteroid3.prefab +++ b/interface/interface_live/Assets/Prefabs/asteroid3.prefab @@ -27,7 +27,7 @@ Transform: m_GameObject: {fileID: 889495328777635882} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -4.0897093, y: -3.2946568, z: 0} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -71,7 +71,7 @@ SpriteRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} - m_SortingLayerID: -1026933429 + m_SortingLayerID: 1016154807 m_SortingLayer: -1 m_SortingOrder: 0 m_Sprite: {fileID: 21300000, guid: 7c8a580b4bd61134f9c036fad1092802, type: 3} diff --git a/interface/interface_live/Assets/Prefabs/community.prefab b/interface/interface_live/Assets/Prefabs/community.prefab index 2c031558..e3316177 100644 --- a/interface/interface_live/Assets/Prefabs/community.prefab +++ b/interface/interface_live/Assets/Prefabs/community.prefab @@ -70,8 +70,8 @@ SpriteRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 + m_SortingLayerID: 1016154807 + m_SortingLayer: 1 m_SortingOrder: 1 m_Sprite: {fileID: 21300000, guid: 9b6824ba5f9a5044da5da80bf1cbead2, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} diff --git a/interface/interface_live/Assets/Prefabs/construction.prefab b/interface/interface_live/Assets/Prefabs/construction.prefab index 5ee86d05..f2973338 100644 --- a/interface/interface_live/Assets/Prefabs/construction.prefab +++ b/interface/interface_live/Assets/Prefabs/construction.prefab @@ -27,7 +27,7 @@ Transform: m_GameObject: {fileID: 4461932328840788347} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 3.5624852, y: 2.1974292, z: 0} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -71,7 +71,7 @@ SpriteRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} - m_SortingLayerID: -1026933429 + m_SortingLayerID: 1016154807 m_SortingLayer: -1 m_SortingOrder: 0 m_Sprite: {fileID: 21300000, guid: b6fffae4cf6650f41b662f7a04e25e43, type: 3} diff --git a/interface/interface_live/Assets/Prefabs/disperse_militaryship3.prefab b/interface/interface_live/Assets/Prefabs/disperse_militaryship3.prefab index f3a4941b..dd861b14 100644 --- a/interface/interface_live/Assets/Prefabs/disperse_militaryship3.prefab +++ b/interface/interface_live/Assets/Prefabs/disperse_militaryship3.prefab @@ -11,7 +11,6 @@ GameObject: - component: {fileID: 6703198644651489217} - component: {fileID: 3937469415223448877} - component: {fileID: 1666208417870257314} - - component: {fileID: 5170778442484362911} m_Layer: 6 m_Name: disperse_militaryship3 m_TagString: Ship @@ -115,61 +114,6 @@ Rigidbody2D: m_SleepingMode: 1 m_CollisionDetection: 1 m_Constraints: 4 ---- !u!60 &5170778442484362911 -PolygonCollider2D: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1718981553063819522} - m_Enabled: 1 - m_Density: 1 - m_Material: {fileID: 0} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_LayerOverridePriority: 0 - m_ForceSendLayers: - serializedVersion: 2 - m_Bits: 4294967295 - m_ForceReceiveLayers: - serializedVersion: 2 - m_Bits: 4294967295 - m_ContactCaptureLayers: - serializedVersion: 2 - m_Bits: 4294967295 - m_CallbackLayers: - serializedVersion: 2 - m_Bits: 4294967295 - m_IsTrigger: 0 - m_UsedByEffector: 0 - m_UsedByComposite: 0 - m_Offset: {x: 0, y: 0} - m_SpriteTilingProperty: - border: {x: 0, y: 0, z: 0, w: 0} - pivot: {x: 0.5, y: 0.5} - oldSize: {x: 1.5058824, y: 1.5058824} - newSize: {x: 1.5058824, y: 1.5058824} - adaptiveTilingThreshold: 0.5 - drawMode: 0 - adaptiveTiling: 0 - m_AutoTiling: 0 - m_Points: - m_Paths: - - - {x: -0.006146442, y: -0.6972494} - - {x: 0.5091776, y: -0.5894133} - - {x: 0.640808, y: -0.39379779} - - {x: 0.6350861, y: 0.04032734} - - {x: 0.3777029, y: 0.58883476} - - {x: 0.0045966506, y: 0.7119452} - - {x: -0.3869319, y: 0.5855302} - - {x: -0.63092756, y: 0.027574211} - - {x: -0.6246743, y: -0.4011431} - - {x: -0.4897193, y: -0.59641504} - m_UseDelaunayMesh: 0 --- !u!1 &6322145347568992764 GameObject: m_ObjectHideFlags: 0 diff --git a/interface/interface_live/Assets/Prefabs/factory.prefab b/interface/interface_live/Assets/Prefabs/factory.prefab index f8d09af7..7314de48 100644 --- a/interface/interface_live/Assets/Prefabs/factory.prefab +++ b/interface/interface_live/Assets/Prefabs/factory.prefab @@ -155,8 +155,8 @@ SpriteRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 + m_SortingLayerID: 1016154807 + m_SortingLayer: 1 m_SortingOrder: 1 m_Sprite: {fileID: 21300000, guid: 4e69b7691cca9c241a1519d297e81311, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} diff --git a/interface/interface_live/Assets/Prefabs/foreshadow_flagship3.prefab b/interface/interface_live/Assets/Prefabs/foreshadow_flagship3.prefab index be38dcd6..14921075 100644 --- a/interface/interface_live/Assets/Prefabs/foreshadow_flagship3.prefab +++ b/interface/interface_live/Assets/Prefabs/foreshadow_flagship3.prefab @@ -179,7 +179,6 @@ GameObject: - component: {fileID: 750574882568330089} - component: {fileID: 4697488312729372394} - component: {fileID: 3397589707071195213} - - component: {fileID: 7800904211505029374} m_Layer: 6 m_Name: foreshadow_flagship3 m_TagString: Ship @@ -283,59 +282,3 @@ Rigidbody2D: m_SleepingMode: 1 m_CollisionDetection: 1 m_Constraints: 4 ---- !u!60 &7800904211505029374 -PolygonCollider2D: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8427987949455047532} - m_Enabled: 1 - m_Density: 1 - m_Material: {fileID: 0} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_LayerOverridePriority: 0 - m_ForceSendLayers: - serializedVersion: 2 - m_Bits: 4294967295 - m_ForceReceiveLayers: - serializedVersion: 2 - m_Bits: 4294967295 - m_ContactCaptureLayers: - serializedVersion: 2 - m_Bits: 4294967295 - m_CallbackLayers: - serializedVersion: 2 - m_Bits: 4294967295 - m_IsTrigger: 0 - m_UsedByEffector: 0 - m_UsedByComposite: 0 - m_Offset: {x: 0, y: 0} - m_SpriteTilingProperty: - border: {x: 0, y: 0, z: 0, w: 0} - pivot: {x: 0.5, y: 0.5} - oldSize: {x: 1.6, y: 1.6} - newSize: {x: 1.6, y: 1.6} - adaptiveTilingThreshold: 0.5 - drawMode: 0 - adaptiveTiling: 0 - m_AutoTiling: 0 - m_Points: - m_Paths: - - - {x: -0.223483, y: 0.7550932} - - {x: -0.5892876, y: 0.53113854} - - {x: -0.7454866, y: 0.14892353} - - {x: -0.7455398, y: -0.16528817} - - {x: -0.32776636, y: -0.7462833} - - {x: 0.3340975, y: -0.7320269} - - {x: 0.7405982, y: -0.16136909} - - {x: 0.7467126, y: 0.1469028} - - {x: 0.57987946, y: 0.52651507} - - {x: 0.23184037, y: 0.75532526} - - {x: -0.0021837428, y: 0.7553253} - m_UseDelaunayMesh: 0 diff --git a/interface/interface_live/Assets/Prefabs/resourceA1.prefab b/interface/interface_live/Assets/Prefabs/resourceA1.prefab index 04c9b0de..93e7dedf 100644 --- a/interface/interface_live/Assets/Prefabs/resourceA1.prefab +++ b/interface/interface_live/Assets/Prefabs/resourceA1.prefab @@ -27,7 +27,7 @@ Transform: m_GameObject: {fileID: 2817536373982564735} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 14.645768, y: 47.229996, z: 0} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: @@ -73,7 +73,7 @@ SpriteRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} - m_SortingLayerID: -1026933429 + m_SortingLayerID: 1016154807 m_SortingLayer: -1 m_SortingOrder: 0 m_Sprite: {fileID: 21300000, guid: 63989317c1fbb7446aa044069dbe9028, type: 3} diff --git a/interface/interface_live/Assets/Prefabs/resourceB1.prefab b/interface/interface_live/Assets/Prefabs/resourceB1.prefab index a1c04105..b281ee05 100644 --- a/interface/interface_live/Assets/Prefabs/resourceB1.prefab +++ b/interface/interface_live/Assets/Prefabs/resourceB1.prefab @@ -195,7 +195,7 @@ Transform: m_GameObject: {fileID: 6689915564642265873} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 16.058525, y: 47.24788, z: 0} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: @@ -241,7 +241,7 @@ SpriteRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} - m_SortingLayerID: -1026933429 + m_SortingLayerID: 1016154807 m_SortingLayer: -1 m_SortingOrder: 0 m_Sprite: {fileID: 21300000, guid: dc1eac1e18f899d4890462a1eba45dc9, type: 3} diff --git a/interface/interface_live/Assets/Prefabs/resourceC1.prefab b/interface/interface_live/Assets/Prefabs/resourceC1.prefab index 505434a1..ff759674 100644 --- a/interface/interface_live/Assets/Prefabs/resourceC1.prefab +++ b/interface/interface_live/Assets/Prefabs/resourceC1.prefab @@ -27,7 +27,7 @@ Transform: m_GameObject: {fileID: 667973134933400006} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 17.685875, y: 47.176346, z: 0} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: @@ -73,7 +73,7 @@ SpriteRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} - m_SortingLayerID: -1026933429 + m_SortingLayerID: 1016154807 m_SortingLayer: -1 m_SortingOrder: 0 m_Sprite: {fileID: 21300000, guid: d918aceb4efb3f14ab46b302b29155d5, type: 3} diff --git a/interface/interface_live/Assets/Prefabs/ruin1.prefab b/interface/interface_live/Assets/Prefabs/ruin1.prefab index 3d88764d..6cd688b7 100644 --- a/interface/interface_live/Assets/Prefabs/ruin1.prefab +++ b/interface/interface_live/Assets/Prefabs/ruin1.prefab @@ -27,7 +27,7 @@ Transform: m_GameObject: {fileID: 1304984658260562521} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 2.4409845, y: -2.1894622, z: 0} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -71,7 +71,7 @@ SpriteRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} - m_SortingLayerID: -1026933429 + m_SortingLayerID: 1016154807 m_SortingLayer: -1 m_SortingOrder: 0 m_Sprite: {fileID: 21300000, guid: e246c0e57901dac4292f64487bf020be, type: 3} diff --git a/interface/interface_live/Assets/Prefabs/ruin2.prefab b/interface/interface_live/Assets/Prefabs/ruin2.prefab index b07a829f..e062c71f 100644 --- a/interface/interface_live/Assets/Prefabs/ruin2.prefab +++ b/interface/interface_live/Assets/Prefabs/ruin2.prefab @@ -27,7 +27,7 @@ Transform: m_GameObject: {fileID: 2191818354525212035} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 2.372131, y: -3.2801943, z: 0} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -71,7 +71,7 @@ SpriteRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} - m_SortingLayerID: -1026933429 + m_SortingLayerID: 1016154807 m_SortingLayer: -1 m_SortingOrder: 0 m_Sprite: {fileID: 21300000, guid: 5e7ef50d1d284c8418b607d6d9206954, type: 3} diff --git a/interface/interface_live/Assets/Prefabs/shadow.prefab b/interface/interface_live/Assets/Prefabs/shadow.prefab index 51ff62d8..ec56f976 100644 --- a/interface/interface_live/Assets/Prefabs/shadow.prefab +++ b/interface/interface_live/Assets/Prefabs/shadow.prefab @@ -26,7 +26,7 @@ Transform: m_GameObject: {fileID: 6520599987196359259} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 29.04213, y: 26.167162, z: 0} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -70,7 +70,7 @@ SpriteRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} - m_SortingLayerID: -1026933429 + m_SortingLayerID: 1016154807 m_SortingLayer: -1 m_SortingOrder: 2 m_Sprite: {fileID: 21300000, guid: c9eb6145284531a45bafb3d1e7cee00b, type: 3} diff --git a/interface/interface_live/Assets/Prefabs/space.prefab b/interface/interface_live/Assets/Prefabs/space.prefab index 4397df69..b305c3bc 100644 --- a/interface/interface_live/Assets/Prefabs/space.prefab +++ b/interface/interface_live/Assets/Prefabs/space.prefab @@ -26,7 +26,7 @@ Transform: m_GameObject: {fileID: 3763284726051510260} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -1.3235307, y: -3.7032256, z: 0} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -70,7 +70,7 @@ SpriteRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} - m_SortingLayerID: -1026933429 + m_SortingLayerID: 1016154807 m_SortingLayer: -1 m_SortingOrder: 0 m_Sprite: {fileID: 21300000, guid: ccda3c683fbd7904b949964c6ae92cf3, type: 3} diff --git a/interface/interface_live/Assets/Prefabs/wormhole.prefab b/interface/interface_live/Assets/Prefabs/wormhole.prefab index c182d89b..1d20f1d7 100644 --- a/interface/interface_live/Assets/Prefabs/wormhole.prefab +++ b/interface/interface_live/Assets/Prefabs/wormhole.prefab @@ -70,8 +70,8 @@ SpriteRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} - m_SortingLayerID: -1026933429 - m_SortingLayer: -1 + m_SortingLayerID: 1016154807 + m_SortingLayer: 1 m_SortingOrder: 0 m_Sprite: {fileID: 21300000, guid: f7c41e4db6c27b14d9f2b17d1cd6b87f, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} diff --git a/interface/interface_live/Assets/Scenes/SampleScene.unity b/interface/interface_live/Assets/Scenes/SampleScene.unity index 62e5f4d4..f872a3a8 100644 --- a/interface/interface_live/Assets/Scenes/SampleScene.unity +++ b/interface/interface_live/Assets/Scenes/SampleScene.unity @@ -123,6 +123,140 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} +--- !u!1 &52794428 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 52794429} + - component: {fileID: 52794431} + - component: {fileID: 52794430} + m_Layer: 5 + m_Name: frameinterval + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &52794429 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 52794428} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 95726355} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 157.92499, y: 17.785004} + m_SizeDelta: {x: 315.85, y: 35.570007} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &52794430 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 52794428} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: 'fi:' + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 24 + m_fontSizeBase: 24 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 1 + m_VerticalAlignment: 256 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!222 &52794431 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 52794428} + m_CullTransparentMesh: 1 --- !u!1 &95726351 GameObject: m_ObjectHideFlags: 0 @@ -217,8 +351,10 @@ RectTransform: m_LocalScale: {x: 0, y: 0, z: 0} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 1242899052} - {fileID: 1915550400} + - {fileID: 2125683882} + - {fileID: 732703962} + - {fileID: 52794429} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} @@ -235,8 +371,11 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 519420032} + - component: {fileID: 519420034} + - component: {fileID: 519420035} - component: {fileID: 519420031} - component: {fileID: 519420029} + - component: {fileID: 519420033} m_Layer: 0 m_Name: Main Camera m_TagString: MainCamera @@ -262,7 +401,7 @@ Camera: m_Enabled: 1 serializedVersion: 2 m_ClearFlags: 2 - m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} + m_BackGroundColor: {r: 0.027450982, g: 0, b: 0.09411766, a: 0} m_projectionMatrixMode: 1 m_GateFitMode: 2 m_FOVAxisMode: 0 @@ -318,6 +457,112 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &519420033 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 519420028} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a79441f348de89743a2939f4d699eac1, type: 3} + m_Name: + m_EditorClassIdentifier: + m_RenderShadows: 1 + m_RequiresDepthTextureOption: 2 + m_RequiresOpaqueTextureOption: 2 + m_CameraType: 0 + m_Cameras: [] + m_RendererIndex: -1 + m_VolumeLayerMask: + serializedVersion: 2 + m_Bits: 1 + m_VolumeTrigger: {fileID: 0} + m_VolumeFrameworkUpdateModeOption: 2 + m_RenderPostProcessing: 1 + m_Antialiasing: 0 + m_AntialiasingQuality: 2 + m_StopNaN: 0 + m_Dithering: 0 + m_ClearDepth: 1 + m_AllowXRRendering: 1 + m_AllowHDROutput: 1 + m_UseScreenCoordOverride: 0 + m_ScreenSizeOverride: {x: 0, y: 0, z: 0, w: 0} + m_ScreenCoordScaleBias: {x: 0, y: 0, z: 0, w: 0} + m_RequiresDepthTexture: 0 + m_RequiresColorTexture: 0 + m_Version: 2 + m_TaaSettings: + quality: 3 + frameInfluence: 0.1 + jitterScale: 1 + mipBias: 0 + varianceClampScale: 0.9 + contrastAdaptiveSharpening: 0 +--- !u!114 &519420034 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 519420028} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: dcf55b72e72da8f40b3291ac61ac6e13, type: 3} + m_Name: + m_EditorClassIdentifier: + cameraScaleCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.14385986 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 1 + value: 1 + inSlope: 2 + outSlope: 2 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + sideBarRect: {fileID: 0} + currentScaleTime: 0.5 + basicCameraScale: 25.5 + currentScale: 0.5 + cameraSpeedMax: 1.5 + cameraSpeed: 0 +--- !u!114 &519420035 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 519420028} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 06c5c0b9b2b04ee4d9ef11f3605fc8ea, type: 3} + m_Name: + m_EditorClassIdentifier: + interactableLayer: + serializedVersion: 2 + m_Bits: 0 + selectingAll: 0 + longClickTime: 0 + longClickTimer: 0 + clickPnt: {x: 0, y: 0} + cameraPos: {x: 0, y: 0} --- !u!1 &689954758 GameObject: m_ObjectHideFlags: 0 @@ -397,6 +642,10 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4619f1c707fe41f4c843e6b3963e7fae, type: 3} m_Name: m_EditorClassIdentifier: + gameTime: {fileID: 1915550401} + score: {fileID: 2125683884} + energy: {fileID: 732703960} + fi: {fileID: 52794430} --- !u!4 &689954761 Transform: m_ObjectHideFlags: 0 @@ -412,6 +661,140 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &732703959 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 732703962} + - component: {fileID: 732703961} + - component: {fileID: 732703960} + m_Layer: 5 + m_Name: Energy + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &732703960 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 732703959} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: 'Energy(Red:Blue):' + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 24 + m_fontSizeBase: 24 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 1 + m_VerticalAlignment: 256 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!222 &732703961 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 732703959} + m_CullTransparentMesh: 1 +--- !u!224 &732703962 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 732703959} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 95726355} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 221.20001, y: -75} + m_SizeDelta: {x: 442.4, y: 35.57} + m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &1168160848 GameObject: m_ObjectHideFlags: 0 @@ -505,13 +888,14 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1200137436} - m_Enabled: 0 + m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 1fd289e7f8f673a44a9c771aa127ae9b, type: 3} m_Name: m_EditorClassIdentifier: info: - text: {fileID: 1242899053} + text: {fileID: 0} + shipx: 5610 --- !u!114 &1200137438 MonoBehaviour: m_ObjectHideFlags: 0 @@ -539,7 +923,7 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1242899051 +--- !u!1 &1247607033 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -547,23 +931,172 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 1242899052} - - component: {fileID: 1242899054} - - component: {fileID: 1242899053} + - component: {fileID: 1247607034} + m_Layer: 0 + m_Name: Map + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1247607034 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1247607033} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1326807096 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1326807097} + - component: {fileID: 1326807098} + m_Layer: 0 + m_Name: GameManager + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1326807097 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1326807096} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 1.122016, y: -0.027379438, z: 0.004945772} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1326807098 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1326807096} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1a3f2ac20373c1f49b6e8fa147801c69, type: 3} + m_Name: + m_EditorClassIdentifier: + Team0Color: + - color: {r: 1, g: 0.027672624, b: 0, a: 0} + idensity: 1.94 + - color: {r: 1, g: 0.41553456, b: 0, a: 0} + idensity: 1.93 + Team1Color: + - color: {r: 0, g: 0.12, b: 0.75, a: 0} + idensity: 2.62 + - color: {r: 0, g: 0.75, b: 0.585, a: 0} + idensity: 2.22 + ResourceColor: + - color: {r: 3.9533496, g: 1.4225332, b: 0, a: 0} + idensity: 2.4 + - color: {r: 3.9533496, g: 1.4225332, b: 0, a: 0} + idensity: 2.4 + LaserColor: + - color: {r: 1, g: 0.40633562, b: 0, a: 0} + idensity: 1.47 + - color: {r: 0.39488173, g: 0, b: 1, a: 0} + idensity: 1.47 + PlasmaColor: + - color: {r: 0.77393425, g: 1, b: 0, a: 0} + idensity: 1.28 + - color: {r: 0, g: 0.7693863, b: 1, a: 0} + idensity: 1.28 +--- !u!1 &1781174433 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1781174435} + - component: {fileID: 1781174434} + m_Layer: 0 + m_Name: Global Volume + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1781174434 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1781174433} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 172515602e62fb746b5d573b38a5fe58, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IsGlobal: 1 + priority: 0 + blendDistance: 0 + weight: 1 + sharedProfile: {fileID: 11400000, guid: c78156561827e7a4b8f5868752ba63c3, type: 2} +--- !u!4 &1781174435 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1781174433} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0.41549286, y: -0.81476766, z: 91.48912} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1915550399 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1915550400} + - component: {fileID: 1915550402} + - component: {fileID: 1915550401} m_Layer: 5 - m_Name: Text (TMP) + m_Name: GameTime m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!224 &1242899052 + m_IsActive: 1 +--- !u!224 &1915550400 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1242899051} + m_GameObject: {fileID: 1915550399} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} @@ -571,18 +1104,18 @@ RectTransform: m_Children: [] m_Father: {fileID: 95726355} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -0.000045776, y: 0} - m_SizeDelta: {x: 1051, y: 533} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 221.20001, y: -17.790009} + m_SizeDelta: {x: 442.4, y: 35.57} m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1242899053 +--- !u!114 &1915550401 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1242899051} + m_GameObject: {fileID: 1915550399} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} @@ -596,7 +1129,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: New Text + m_text: 'GameTime:' m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} @@ -623,8 +1156,8 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 20 - m_fontSizeBase: 20 + m_fontSize: 24 + m_fontSizeBase: 24 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 @@ -665,95 +1198,15 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} ---- !u!222 &1242899054 +--- !u!222 &1915550402 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1242899051} + m_GameObject: {fileID: 1915550399} m_CullTransparentMesh: 1 ---- !u!1 &1247607033 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1247607034} - m_Layer: 0 - m_Name: Map - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1247607034 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1247607033} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0.41549286, y: -0.81476766, z: 91.48912} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1781174433 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1781174435} - - component: {fileID: 1781174434} - m_Layer: 0 - m_Name: Global Volume - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &1781174434 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1781174433} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 172515602e62fb746b5d573b38a5fe58, type: 3} - m_Name: - m_EditorClassIdentifier: - m_IsGlobal: 1 - priority: 0 - blendDistance: 0 - weight: 1 - sharedProfile: {fileID: 11400000, guid: c78156561827e7a4b8f5868752ba63c3, type: 2} ---- !u!4 &1781174435 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1781174433} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0.41549286, y: -0.81476766, z: 91.48912} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1915550399 +--- !u!1 &2125683881 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -761,23 +1214,23 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 1915550400} - - component: {fileID: 1915550402} - - component: {fileID: 1915550401} + - component: {fileID: 2125683882} + - component: {fileID: 2125683883} + - component: {fileID: 2125683884} m_Layer: 5 - m_Name: GameTime + m_Name: Score m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &1915550400 +--- !u!224 &2125683882 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1915550399} + m_GameObject: {fileID: 2125683881} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} @@ -785,18 +1238,26 @@ RectTransform: m_Children: [] m_Father: {fileID: 95726355} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -426, y: -241} - m_SizeDelta: {x: -852, y: -482} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 221.20001, y: -46} + m_SizeDelta: {x: 442.4, y: 35.57} m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1915550401 +--- !u!222 &2125683883 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2125683881} + m_CullTransparentMesh: 1 +--- !u!114 &2125683884 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1915550399} + m_GameObject: {fileID: 2125683881} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} @@ -810,7 +1271,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: New Text + m_text: 'Score(Red:Blue):' m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} @@ -837,8 +1298,8 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 36 - m_fontSizeBase: 36 + m_fontSize: 24 + m_fontSizeBase: 24 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 @@ -879,14 +1340,6 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} ---- !u!222 &1915550402 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1915550399} - m_CullTransparentMesh: 1 --- !u!1660057539 &9223372036854775807 SceneRoots: m_ObjectHideFlags: 0 @@ -898,3 +1351,4 @@ SceneRoots: - {fileID: 1781174435} - {fileID: 689954761} - {fileID: 1247607034} + - {fileID: 1326807097} diff --git a/interface/interface_live/Assets/Scenes/SampleScene/Global Volume Profile.asset b/interface/interface_live/Assets/Scenes/SampleScene/Global Volume Profile.asset index ca7beb05..4f5049c7 100644 --- a/interface/interface_live/Assets/Scenes/SampleScene/Global Volume Profile.asset +++ b/interface/interface_live/Assets/Scenes/SampleScene/Global Volume Profile.asset @@ -18,10 +18,10 @@ MonoBehaviour: m_Value: 1 threshold: m_OverrideState: 1 - m_Value: 0.9 + m_Value: 0.15 intensity: m_OverrideState: 1 - m_Value: 0 + m_Value: 0.78 scatter: m_OverrideState: 0 m_Value: 0.7 diff --git a/interface/interface_live/Assets/Scripts/Camera.meta b/interface/interface_live/Assets/Scripts/Camera.meta new file mode 100644 index 00000000..89923c83 --- /dev/null +++ b/interface/interface_live/Assets/Scripts/Camera.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 5ef70af49a1a2fc47b7693b09cbf83c6 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/interface/interface_live/Assets/Scripts/Camera/CameraControl.cs b/interface/interface_live/Assets/Scripts/Camera/CameraControl.cs new file mode 100644 index 00000000..aed7a4fb --- /dev/null +++ b/interface/interface_live/Assets/Scripts/Camera/CameraControl.cs @@ -0,0 +1,78 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class CameraControl : MonoBehaviour +{ + Vector2 mousePos; + public AnimationCurve cameraScaleCurve; + public RectTransform sideBarRect; + public float currentScaleTime = 0.5f, basicCameraScale, currentScale; + public float cameraSpeedMax = 1.5f, cameraSpeed; + void Start() + { + currentScale = cameraScaleCurve.Evaluate(currentScaleTime) * basicCameraScale; + Camera.main.orthographicSize = currentScale; + } + + // Update is called once per frame + void Update() + { + mousePos = Input.mousePosition; + // Debug.Log(mousePos); + if (Input.GetKey(KeyCode.A) || Input.GetKey(KeyCode.D) || Input.GetKey(KeyCode.W) || Input.GetKey(KeyCode.S)) + { + cameraSpeed = Mathf.Lerp(cameraSpeed, cameraSpeedMax, 0.1f); + if (Input.GetKey(KeyCode.A) && transform.position.x >= -0.5f) + { + transform.Translate(Vector3.left * Time.deltaTime * currentScale * cameraSpeed); + } + if (Input.GetKey(KeyCode.D) && transform.position.x <= 49.5f) + { + transform.Translate(Vector3.right * Time.deltaTime * currentScale * cameraSpeed); + } + if (Input.GetKey(KeyCode.W) && transform.position.y <= 49.5f) + { + transform.Translate(Vector3.up * Time.deltaTime * currentScale * cameraSpeed); + } + if (Input.GetKey(KeyCode.S) && transform.position.y >= -0.5f) + { + transform.Translate(Vector3.down * Time.deltaTime * currentScale * cameraSpeed); + } + } + else + { + cameraSpeed = Mathf.Lerp(cameraSpeed, 0, 0.1f); + } + if (mousePos.x > 0 && mousePos.x < Screen.width && mousePos.y > 0 && mousePos.y < Screen.height) + { + if (Camera.main.ScreenToWorldPoint(mousePos).x > -1 && + Camera.main.ScreenToWorldPoint(mousePos).x < 50 && + Camera.main.ScreenToWorldPoint(mousePos).y > -1 && + Camera.main.ScreenToWorldPoint(mousePos).y < 50) + { + if (!sideBarRect || (sideBarRect && !RectTransformUtility.RectangleContainsScreenPoint(sideBarRect, Input.mousePosition, Camera.main))) + { + if (Input.mouseScrollDelta.y < 0) + { + currentScaleTime = Mathf.Min(1f, currentScaleTime + 0.02f); + + currentScale = cameraScaleCurve.Evaluate(currentScaleTime) * basicCameraScale; + Camera.main.transform.position = Camera.main.ScreenToWorldPoint(mousePos) + + currentScale / Camera.main.orthographicSize * (Camera.main.transform.position - Camera.main.ScreenToWorldPoint(mousePos)); + Camera.main.orthographicSize = currentScale; + } + if (Input.mouseScrollDelta.y > 0) + { + currentScaleTime = Mathf.Max(0f, currentScaleTime - 0.02f); + currentScale = cameraScaleCurve.Evaluate(currentScaleTime) * basicCameraScale; + Camera.main.transform.position = Camera.main.ScreenToWorldPoint(mousePos) + + currentScale / Camera.main.orthographicSize * (Camera.main.transform.position - Camera.main.ScreenToWorldPoint(mousePos)); + Camera.main.orthographicSize = currentScale; + } + } + } + } + // Debug.Log(RectTransformUtility.RectangleContainsScreenPoint(sideBarRect, Input.mousePosition, Camera.main)); + } +} diff --git a/interface/interface_live/Assets/Scripts/Camera/CameraControl.cs.meta b/interface/interface_live/Assets/Scripts/Camera/CameraControl.cs.meta new file mode 100644 index 00000000..2454408d --- /dev/null +++ b/interface/interface_live/Assets/Scripts/Camera/CameraControl.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: dcf55b72e72da8f40b3291ac61ac6e13 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/interface/interface_live/Assets/Scripts/Debugger.cs b/interface/interface_live/Assets/Scripts/Debugger.cs index 4f55e477..9f48bd28 100644 --- a/interface/interface_live/Assets/Scripts/Debugger.cs +++ b/interface/interface_live/Assets/Scripts/Debugger.cs @@ -8,63 +8,157 @@ public class Debugger : SingletonMono { public string info; public TextMeshProUGUI text; - public MessageOfShip messageOfShip; - public MessageOfObj messageOfObj; + public MessageOfShip messageOfShip1, messageOfShip2; + public MessageOfObj messageOfObj1, messageOfObj2; public MessageToClient messageToClient; public MessageOfAll messageOfAll; - + public int shipx = 1000; void Start() { - messageOfShip = new MessageOfShip() + // messageOfShip1 = new MessageOfShip() + // { + // X = 1145, + // Y = 1919, + // Speed = 0, + // Hp = 0, + // Armor = 0, + // Shield = 0, + // TeamId = 0, + // PlayerId = 1, + // Guid = 0, + // ShipState = 0, + // ShipType = 0, + // ViewRange = 0, + // ProducerType = 0, + // ConstructorType = 0, + // ArmorType = 0, + // ShieldType = 0, + // WeaponType = 0, + // FacingDirection = 0.0 + // }; + // messageOfShip2 = new MessageOfShip() + // { + // X = 1919, + // Y = 19190, + // Speed = 0, + // Hp = 0, + // Armor = 0, + // Shield = 0, + // TeamId = 0, + // PlayerId = 1, + // Guid = 0, + // ShipState = 0, + // ShipType = 0, + // ViewRange = 0, + // ProducerType = 0, + // ConstructorType = 0, + // ArmorType = 0, + // ShieldType = 0, + // WeaponType = 0, + // FacingDirection = 0.0 + // }; + + // messageOfObj1 = new MessageOfObj() + // { + // ShipMessage = messageOfShip1, + // }; + // messageOfObj2 = new MessageOfObj() + // { + // ShipMessage = messageOfShip2, + // }; + + // messageToClient = new MessageToClient(); + // messageOfAll = new MessageOfAll() + // { + + // GameTime = 1, + // RedTeamScore = 2, + // BlueTeamScore = 3, + // RedTeamEnergy = 4, + // BlueTeamEnergy = 5, + // RedHomeHp = 6, + // BlueHomeHp = 7, + // }; + // messageToClient.ObjMessage.Add(messageOfObj1); + // messageToClient.ObjMessage.Add(messageOfObj2); + // messageToClient.GameState = GameState.GameRunning; + // messageToClient.AllMessage = messageOfAll; + // info = JsonConvert.SerializeObject(messageToClient); + // Debug.Log("myjson:" + info.ToString()); + + + // MessageOfNews messageOfNews = new MessageOfNews() + // { + + // }; + // messageOfNews.NewsCase + + + info = System.IO.File.ReadAllText(@"D:\SoftwareDepartment\THUAI7\THUAI7\interface\interface_live\Assets\message(1).json"); + UpdateManager.GetInstance().UpdateMessageByJson(info); + info = System.IO.File.ReadAllText(@"D:\SoftwareDepartment\THUAI7\THUAI7\interface\interface_live\Assets\message.json"); + MessageOfFort messageOfFort = new MessageOfFort() { - X = 1145, - Y = 1919, - Speed = 0, - Hp = 0, - Armor = 0, - Shield = 0, - TeamId = 0, - PlayerId = 1, - Guid = 0, - ShipState = 0, - ShipType = 0, - ViewRange = 0, - ProducerType = 0, - ConstructorType = 0, - ArmorType = 0, - ShieldType = 0, - WeaponType = 0, - FacingDirection = 0.0 + X = 45, + Y = 50, + Hp = 100, + TeamId = 1, }; - - messageOfObj = new MessageOfObj() + MessageOfObj messageOfObj = new MessageOfObj() { - ShipMessage = messageOfShip, + FortMessage = messageOfFort, }; - - messageToClient = new MessageToClient(); - messageOfAll = new MessageOfAll() + messageToClient = JsonConvert.DeserializeObject(info, new JsonSerializerSettings { - GameTime = 1, - RedTeamScore = 2, - BlueTeamScore = 3, - RedTeamEnergy = 4, - BlueTeamEnergy = 5, - RedHomeHp = 6, - BlueHomeHp = 7, - }; + NullValueHandling = NullValueHandling.Ignore, + ContractResolver = new Newtonsoft.Json.Serialization.CamelCasePropertyNamesContractResolver() + }); messageToClient.ObjMessage.Add(messageOfObj); - messageToClient.GameState = GameState.GameRunning; - messageToClient.AllMessage = messageOfAll; info = JsonConvert.SerializeObject(messageToClient); UpdateManager.GetInstance().UpdateMessageByJson(info); - } // Update is called once per frame void Update() { + // Debug.Log(info.Contains(@"""shipMessage"": { + // ""x"": " + shipx.ToString())); + // info = info.Replace(@"""shipMessage"": { + // ""x"": " + shipx.ToString(), + // @"""shipMessage"": { + // ""x"": " + ((shipx + 10)).ToString()); + // shipx = ((shipx + 10)); + // Debug.Log(info); + + // info = System.IO.File.ReadAllText(@"D:\SoftwareDepartment\THUAI7\THUAI7\interface\interface_live\Assets\message.json"); + // UpdateManager.GetInstance().UpdateMessageByJson(info); + + // info = info.Replace(@"""shipMessage"": { + // ""x"": " + shipx.ToString(), + // @"""shipMessage"": { + // ""x"": " + ((shipx + 10)).ToString()); + // shipx = ((shipx + 10)); + // UpdateManager.GetInstance().UpdateMessageByJson(info); + // info = info.Replace(@"""shipMessage"": { + // ""x"": " + shipx.ToString(), + // @"""shipMessage"": { + // ""x"": " + ((shipx + 10)).ToString()); + // shipx = ((shipx + 10)); + // UpdateManager.GetInstance().UpdateMessageByJson(info); + // info = info.Replace(@"""shipMessage"": { + // ""x"": " + shipx.ToString(), + // @"""shipMessage"": { + // ""x"": " + ((shipx + 10)).ToString()); + // shipx = ((shipx + 10)); + // UpdateManager.GetInstance().UpdateMessageByJson(info); + // info = info.Replace(@"""shipMessage"": { + // ""x"": " + shipx.ToString(), + // @"""shipMessage"": { + // ""x"": " + ((shipx + 10)).ToString()); + // shipx = ((shipx + 10)); + // UpdateManager.GetInstance().UpdateMessageByJson(info); + // Debug.Log(info); // messageToClient.AllMessage.GameTime++; // info = JsonConvert.SerializeObject(messageToClient); // UpdateManager.GetInstance().UpdateMessageByJson(info); diff --git a/interface/interface_live/Assets/Scripts/Define/Message2Clients.cs b/interface/interface_live/Assets/Scripts/Define/Message2Clients.cs index 59c0a1c8..6af56fa4 100644 --- a/interface/interface_live/Assets/Scripts/Define/Message2Clients.cs +++ b/interface/interface_live/Assets/Scripts/Define/Message2Clients.cs @@ -2,9 +2,10 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: Message2Clients.proto // -#pragma warning disable 1591, 0612, 3021, 8981 +#pragma warning disable 1591, 0612, 3021 #region Designer generated code +using Newtonsoft.Json; using pb = global::Google.Protobuf; using pbc = global::Google.Protobuf.Collections; using pbr = global::Google.Protobuf.Reflection; @@ -52,47 +53,47 @@ static Message2ClientsReflection() "Cgd0ZWFtX2lkGAQgASgDIkcKEk1lc3NhZ2VPZkNvbW11bml0eRIJCgF4GAEg", "ASgFEgkKAXkYAiABKAUSCgoCaHAYAyABKAUSDwoHdGVhbV9pZBgEIAEoAyJC", "Cg1NZXNzYWdlT2ZGb3J0EgkKAXgYASABKAUSCQoBeRgCIAEoBRIKCgJocBgD", - "IAEoBRIPCgd0ZWFtX2lkGAQgASgDIjUKEU1lc3NhZ2VPZldvcm1ob2xlEgkK", - "AXgYASABKAUSCQoBeRgCIAEoBRIKCgJocBgDIAEoBSI7ChFNZXNzYWdlT2ZS", - "ZXNvdXJjZRIJCgF4GAEgASgFEgkKAXkYAiABKAUSEAoIcHJvZ3Jlc3MYAyAB", - "KAUiQgoNTWVzc2FnZU9mSG9tZRIJCgF4GAEgASgFEgkKAXkYAiABKAUSCgoC", - "aHAYAyABKAUSDwoHdGVhbV9pZBgEIAEoAyKBAQoMTWVzc2FnZU9mTWFwEg4K", - "BmhlaWdodBgBIAEoDRINCgV3aWR0aBgCIAEoDRIoCgRyb3dzGAMgAygLMhou", - "cHJvdG9idWYuTWVzc2FnZU9mTWFwLlJvdxooCgNSb3cSIQoEY29scxgBIAMo", - "DjITLnByb3RvYnVmLlBsYWNlVHlwZSJSCg1NZXNzYWdlT2ZUZWFtEg8KB3Rl", - "YW1faWQYASABKAMSEQoJcGxheWVyX2lkGAIgASgDEg0KBXNjb3JlGAMgASgD", - "Eg4KBmVuZXJneRgEIAEoAyKfBQoMTWVzc2FnZU9mT2JqEi8KDHNoaXBfbWVz", - "c2FnZRgBIAEoCzIXLnByb3RvYnVmLk1lc3NhZ2VPZlNoaXBIABIzCg5idWxs", - "ZXRfbWVzc2FnZRgCIAEoCzIZLnByb3RvYnVmLk1lc3NhZ2VPZkJ1bGxldEgA", - "EjUKD2ZhY3RvcnlfbWVzc2FnZRgDIAEoCzIaLnByb3RvYnVmLk1lc3NhZ2VP", - "ZkZhY3RvcnlIABI5ChFjb21tdW5pdHlfbWVzc2FnZRgEIAEoCzIcLnByb3Rv", - "YnVmLk1lc3NhZ2VPZkNvbW11bml0eUgAEi8KDGZvcnRfbWVzc2FnZRgFIAEo", - "CzIXLnByb3RvYnVmLk1lc3NhZ2VPZkZvcnRIABI3ChB3b3JtaG9sZV9tZXNz", - "YWdlGAYgASgLMhsucHJvdG9idWYuTWVzc2FnZU9mV29ybWhvbGVIABIvCgxo", - "b21lX21lc3NhZ2UYByABKAsyFy5wcm90b2J1Zi5NZXNzYWdlT2ZIb21lSAAS", - "NwoQcmVzb3VyY2VfbWVzc2FnZRgIIAEoCzIbLnByb3RvYnVmLk1lc3NhZ2VP", - "ZlJlc291cmNlSAASLQoLbWFwX21lc3NhZ2UYCSABKAsyFi5wcm90b2J1Zi5N", - "ZXNzYWdlT2ZNYXBIABIvCgxuZXdzX21lc3NhZ2UYCiABKAsyFy5wcm90b2J1", - "Zi5NZXNzYWdlT2ZOZXdzSAASQAoVYm9tYmVkX2J1bGxldF9tZXNzYWdlGAsg", - "ASgLMh8ucHJvdG9idWYuTWVzc2FnZU9mQm9tYmVkQnVsbGV0SAASLwoMdGVh", - "bV9tZXNzYWdlGAwgASgLMhcucHJvdG9idWYuTWVzc2FnZU9mVGVhbUgAQhAK", - "Dm1lc3NhZ2Vfb2Zfb2JqIrABCgxNZXNzYWdlT2ZBbGwSEQoJZ2FtZV90aW1l", - "GAEgASgFEhYKDnJlZF90ZWFtX3Njb3JlGAIgASgFEhcKD2JsdWVfdGVhbV9z", - "Y29yZRgDIAEoBRIXCg9yZWRfdGVhbV9lbmVyZ3kYBCABKAUSGAoQYmx1ZV90", - "ZWFtX2VuZXJneRgFIAEoBRITCgtyZWRfaG9tZV9ocBgGIAEoBRIUCgxibHVl", - "X2hvbWVfaHAYByABKAUilAEKD01lc3NhZ2VUb0NsaWVudBIrCgtvYmpfbWVz", - "c2FnZRgBIAMoCzIWLnByb3RvYnVmLk1lc3NhZ2VPZk9iahInCgpnYW1lX3N0", - "YXRlGAIgASgOMhMucHJvdG9idWYuR2FtZVN0YXRlEisKC2FsbF9tZXNzYWdl", - "GAMgASgLMhYucHJvdG9idWYuTWVzc2FnZU9mQWxsIkoKB01vdmVSZXMSFAoM", - "YWN0dWFsX3NwZWVkGAEgASgDEhQKDGFjdHVhbF9hbmdsZRgCIAEoARITCgth", - "Y3Rfc3VjY2VzcxgDIAEoCCI2CgxCdWlsZFNoaXBSZXMSEwoLYWN0X3N1Y2Nl", - "c3MYASABKAgSEQoJcGxheWVyX2lkGAIgASgDIh4KB0Jvb2xSZXMSEwoLYWN0", - "X3N1Y2Nlc3MYASABKAgiOQoLU2hpcEluZm9SZXMSKgoJc2hpcF9pbmZvGAEg", - "AygLMhcucHJvdG9idWYuTWVzc2FnZU9mU2hpcCIZCgZFY29SZXMSDwoHZWNv", - "bm9teRgBIAEoAyJ6Cg1NZXNzYWdlT2ZOZXdzEhYKDHRleHRfbWVzc2FnZRgB", - "IAEoCUgAEhgKDmJpbmFyeV9tZXNzYWdlGAIgASgMSAASDwoHZnJvbV9pZBgD", - "IAEoAxINCgV0b19pZBgEIAEoAxIPCgd0ZWFtX2lkGAUgASgDQgYKBG5ld3Ni", - "BnByb3RvMw==")); + "IAEoBRIPCgd0ZWFtX2lkGAQgASgDIkEKEU1lc3NhZ2VPZldvcm1ob2xlEgkK", + "AXgYASABKAUSCQoBeRgCIAEoBRIKCgJocBgDIAEoBRIKCgJpZBgEIAEoBSI7", + "ChFNZXNzYWdlT2ZSZXNvdXJjZRIJCgF4GAEgASgFEgkKAXkYAiABKAUSEAoI", + "cHJvZ3Jlc3MYAyABKAUiQgoNTWVzc2FnZU9mSG9tZRIJCgF4GAEgASgFEgkK", + "AXkYAiABKAUSCgoCaHAYAyABKAUSDwoHdGVhbV9pZBgEIAEoAyKBAQoMTWVz", + "c2FnZU9mTWFwEg4KBmhlaWdodBgBIAEoDRINCgV3aWR0aBgCIAEoDRIoCgRy", + "b3dzGAMgAygLMhoucHJvdG9idWYuTWVzc2FnZU9mTWFwLlJvdxooCgNSb3cS", + "IQoEY29scxgBIAMoDjITLnByb3RvYnVmLlBsYWNlVHlwZSJSCg1NZXNzYWdl", + "T2ZUZWFtEg8KB3RlYW1faWQYASABKAMSEQoJcGxheWVyX2lkGAIgASgDEg0K", + "BXNjb3JlGAMgASgDEg4KBmVuZXJneRgEIAEoAyKfBQoMTWVzc2FnZU9mT2Jq", + "Ei8KDHNoaXBfbWVzc2FnZRgBIAEoCzIXLnByb3RvYnVmLk1lc3NhZ2VPZlNo", + "aXBIABIzCg5idWxsZXRfbWVzc2FnZRgCIAEoCzIZLnByb3RvYnVmLk1lc3Nh", + "Z2VPZkJ1bGxldEgAEjUKD2ZhY3RvcnlfbWVzc2FnZRgDIAEoCzIaLnByb3Rv", + "YnVmLk1lc3NhZ2VPZkZhY3RvcnlIABI5ChFjb21tdW5pdHlfbWVzc2FnZRgE", + "IAEoCzIcLnByb3RvYnVmLk1lc3NhZ2VPZkNvbW11bml0eUgAEi8KDGZvcnRf", + "bWVzc2FnZRgFIAEoCzIXLnByb3RvYnVmLk1lc3NhZ2VPZkZvcnRIABI3ChB3", + "b3JtaG9sZV9tZXNzYWdlGAYgASgLMhsucHJvdG9idWYuTWVzc2FnZU9mV29y", + "bWhvbGVIABIvCgxob21lX21lc3NhZ2UYByABKAsyFy5wcm90b2J1Zi5NZXNz", + "YWdlT2ZIb21lSAASNwoQcmVzb3VyY2VfbWVzc2FnZRgIIAEoCzIbLnByb3Rv", + "YnVmLk1lc3NhZ2VPZlJlc291cmNlSAASLQoLbWFwX21lc3NhZ2UYCSABKAsy", + "Fi5wcm90b2J1Zi5NZXNzYWdlT2ZNYXBIABIvCgxuZXdzX21lc3NhZ2UYCiAB", + "KAsyFy5wcm90b2J1Zi5NZXNzYWdlT2ZOZXdzSAASQAoVYm9tYmVkX2J1bGxl", + "dF9tZXNzYWdlGAsgASgLMh8ucHJvdG9idWYuTWVzc2FnZU9mQm9tYmVkQnVs", + "bGV0SAASLwoMdGVhbV9tZXNzYWdlGAwgASgLMhcucHJvdG9idWYuTWVzc2Fn", + "ZU9mVGVhbUgAQhAKDm1lc3NhZ2Vfb2Zfb2JqIrABCgxNZXNzYWdlT2ZBbGwS", + "EQoJZ2FtZV90aW1lGAEgASgFEhYKDnJlZF90ZWFtX3Njb3JlGAIgASgFEhcK", + "D2JsdWVfdGVhbV9zY29yZRgDIAEoBRIXCg9yZWRfdGVhbV9lbmVyZ3kYBCAB", + "KAUSGAoQYmx1ZV90ZWFtX2VuZXJneRgFIAEoBRITCgtyZWRfaG9tZV9ocBgG", + "IAEoBRIUCgxibHVlX2hvbWVfaHAYByABKAUilAEKD01lc3NhZ2VUb0NsaWVu", + "dBIrCgtvYmpfbWVzc2FnZRgBIAMoCzIWLnByb3RvYnVmLk1lc3NhZ2VPZk9i", + "ahInCgpnYW1lX3N0YXRlGAIgASgOMhMucHJvdG9idWYuR2FtZVN0YXRlEisK", + "C2FsbF9tZXNzYWdlGAMgASgLMhYucHJvdG9idWYuTWVzc2FnZU9mQWxsIkoK", + "B01vdmVSZXMSFAoMYWN0dWFsX3NwZWVkGAEgASgDEhQKDGFjdHVhbF9hbmds", + "ZRgCIAEoARITCgthY3Rfc3VjY2VzcxgDIAEoCCI2CgxCdWlsZFNoaXBSZXMS", + "EwoLYWN0X3N1Y2Nlc3MYASABKAgSEQoJcGxheWVyX2lkGAIgASgDIh4KB0Jv", + "b2xSZXMSEwoLYWN0X3N1Y2Nlc3MYASABKAgiOQoLU2hpcEluZm9SZXMSKgoJ", + "c2hpcF9pbmZvGAEgAygLMhcucHJvdG9idWYuTWVzc2FnZU9mU2hpcCIZCgZF", + "Y29SZXMSDwoHZWNvbm9teRgBIAEoAyJ6Cg1NZXNzYWdlT2ZOZXdzEhYKDHRl", + "eHRfbWVzc2FnZRgBIAEoCUgAEhgKDmJpbmFyeV9tZXNzYWdlGAIgASgMSAAS", + "DwoHZnJvbV9pZBgDIAEoAxINCgV0b19pZBgEIAEoAxIPCgd0ZWFtX2lkGAUg", + "ASgDQgYKBG5ld3NiBnByb3RvMw==")); descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, new pbr::FileDescriptor[] { global::Protobuf.MessageTypeReflection.Descriptor, }, new pbr::GeneratedClrTypeInfo(null, null, new pbr::GeneratedClrTypeInfo[] { @@ -102,7 +103,7 @@ static Message2ClientsReflection() new pbr::GeneratedClrTypeInfo(typeof(global::Protobuf.MessageOfFactory), global::Protobuf.MessageOfFactory.Parser, new[]{ "X", "Y", "Hp", "TeamId" }, null, null, null, null), new pbr::GeneratedClrTypeInfo(typeof(global::Protobuf.MessageOfCommunity), global::Protobuf.MessageOfCommunity.Parser, new[]{ "X", "Y", "Hp", "TeamId" }, null, null, null, null), new pbr::GeneratedClrTypeInfo(typeof(global::Protobuf.MessageOfFort), global::Protobuf.MessageOfFort.Parser, new[]{ "X", "Y", "Hp", "TeamId" }, null, null, null, null), - new pbr::GeneratedClrTypeInfo(typeof(global::Protobuf.MessageOfWormhole), global::Protobuf.MessageOfWormhole.Parser, new[]{ "X", "Y", "Hp" }, null, null, null, null), + new pbr::GeneratedClrTypeInfo(typeof(global::Protobuf.MessageOfWormhole), global::Protobuf.MessageOfWormhole.Parser, new[]{ "X", "Y", "Hp", "Id" }, null, null, null, null), new pbr::GeneratedClrTypeInfo(typeof(global::Protobuf.MessageOfResource), global::Protobuf.MessageOfResource.Parser, new[]{ "X", "Y", "Progress" }, null, null, null, null), new pbr::GeneratedClrTypeInfo(typeof(global::Protobuf.MessageOfHome), global::Protobuf.MessageOfHome.Parser, new[]{ "X", "Y", "Hp", "TeamId" }, null, null, null, null), new pbr::GeneratedClrTypeInfo(typeof(global::Protobuf.MessageOfMap), global::Protobuf.MessageOfMap.Parser, new[]{ "Height", "Width", "Rows" }, null, null, null, new pbr::GeneratedClrTypeInfo[] { new pbr::GeneratedClrTypeInfo(typeof(global::Protobuf.MessageOfMap.Types.Row), global::Protobuf.MessageOfMap.Types.Row.Parser, new[]{ "Cols" }, null, null, null, null)}), @@ -122,7 +123,6 @@ static Message2ClientsReflection() } #region Messages - [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")] public sealed partial class MessageOfShip : pb::IMessage #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE , pb::IBufferMessage @@ -131,25 +131,21 @@ public sealed partial class MessageOfShip : pb::IMessage private static readonly pb::MessageParser _parser = new pb::MessageParser(() => new MessageOfShip()); private pb::UnknownFieldSet _unknownFields; [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public static pb::MessageParser Parser { get { return _parser; } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public static pbr::MessageDescriptor Descriptor { get { return global::Protobuf.Message2ClientsReflection.Descriptor.MessageTypes[0]; } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] pbr::MessageDescriptor pb::IMessage.Descriptor { get { return Descriptor; } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public MessageOfShip() { OnConstruction(); @@ -158,7 +154,6 @@ public MessageOfShip() partial void OnConstruction(); [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public MessageOfShip(MessageOfShip other) : this() { x_ = other.x_; @@ -183,7 +178,6 @@ public MessageOfShip(MessageOfShip other) : this() } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public MessageOfShip Clone() { return new MessageOfShip(this); @@ -193,7 +187,6 @@ public MessageOfShip Clone() public const int XFieldNumber = 1; private int x_; [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public int X { get { return x_; } @@ -207,7 +200,6 @@ public int X public const int YFieldNumber = 2; private int y_; [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public int Y { get { return y_; } @@ -221,7 +213,6 @@ public int Y public const int SpeedFieldNumber = 3; private int speed_; [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public int Speed { get { return speed_; } @@ -235,7 +226,6 @@ public int Speed public const int HpFieldNumber = 4; private int hp_; [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public int Hp { get { return hp_; } @@ -249,7 +239,6 @@ public int Hp public const int ArmorFieldNumber = 5; private int armor_; [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public int Armor { get { return armor_; } @@ -263,7 +252,6 @@ public int Armor public const int ShieldFieldNumber = 6; private int shield_; [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public int Shield { get { return shield_; } @@ -277,7 +265,6 @@ public int Shield public const int TeamIdFieldNumber = 7; private long teamId_; [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public long TeamId { get { return teamId_; } @@ -291,7 +278,6 @@ public long TeamId public const int PlayerIdFieldNumber = 8; private long playerId_; [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public long PlayerId { get { return playerId_; } @@ -305,7 +291,6 @@ public long PlayerId public const int GuidFieldNumber = 9; private long guid_; [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public long Guid { get { return guid_; } @@ -319,7 +304,6 @@ public long Guid public const int ShipStateFieldNumber = 10; private global::Protobuf.ShipState shipState_ = global::Protobuf.ShipState.NullStatus; [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public global::Protobuf.ShipState ShipState { get { return shipState_; } @@ -333,7 +317,6 @@ public long Guid public const int ShipTypeFieldNumber = 11; private global::Protobuf.ShipType shipType_ = global::Protobuf.ShipType.NullShipType; [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public global::Protobuf.ShipType ShipType { get { return shipType_; } @@ -347,7 +330,6 @@ public long Guid public const int ViewRangeFieldNumber = 12; private int viewRange_; [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public int ViewRange { get { return viewRange_; } @@ -361,7 +343,6 @@ public int ViewRange public const int ProducerTypeFieldNumber = 13; private global::Protobuf.ProducerType producerType_ = global::Protobuf.ProducerType.NullProducerType; [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public global::Protobuf.ProducerType ProducerType { get { return producerType_; } @@ -375,7 +356,6 @@ public int ViewRange public const int ConstructorTypeFieldNumber = 14; private global::Protobuf.ConstructorType constructorType_ = global::Protobuf.ConstructorType.NullConstructorType; [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public global::Protobuf.ConstructorType ConstructorType { get { return constructorType_; } @@ -389,7 +369,6 @@ public int ViewRange public const int ArmorTypeFieldNumber = 15; private global::Protobuf.ArmorType armorType_ = global::Protobuf.ArmorType.NullArmorType; [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public global::Protobuf.ArmorType ArmorType { get { return armorType_; } @@ -403,7 +382,6 @@ public int ViewRange public const int ShieldTypeFieldNumber = 16; private global::Protobuf.ShieldType shieldType_ = global::Protobuf.ShieldType.NullShieldType; [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public global::Protobuf.ShieldType ShieldType { get { return shieldType_; } @@ -417,7 +395,6 @@ public int ViewRange public const int WeaponTypeFieldNumber = 17; private global::Protobuf.WeaponType weaponType_ = global::Protobuf.WeaponType.NullWeaponType; [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public global::Protobuf.WeaponType WeaponType { get { return weaponType_; } @@ -431,7 +408,6 @@ public int ViewRange public const int FacingDirectionFieldNumber = 18; private double facingDirection_; [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public double FacingDirection { get { return facingDirection_; } @@ -442,14 +418,12 @@ public double FacingDirection } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public override bool Equals(object other) { return Equals(other as MessageOfShip); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public bool Equals(MessageOfShip other) { if (ReferenceEquals(other, null)) @@ -482,7 +456,6 @@ public bool Equals(MessageOfShip other) } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public override int GetHashCode() { int hash = 1; @@ -512,14 +485,12 @@ public override int GetHashCode() } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public override string ToString() { return pb::JsonFormatter.ToDiagnosticString(this); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public void WriteTo(pb::CodedOutputStream output) { #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE @@ -605,7 +576,6 @@ public void WriteTo(pb::CodedOutputStream output) #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) { if (X != 0) @@ -706,7 +676,6 @@ public void WriteTo(pb::CodedOutputStream output) #endif [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public int CalculateSize() { int size = 0; @@ -790,7 +759,6 @@ public int CalculateSize() } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public void MergeFrom(MessageOfShip other) { if (other == null) @@ -873,7 +841,6 @@ public void MergeFrom(MessageOfShip other) } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public void MergeFrom(pb::CodedInputStream input) { #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE @@ -964,7 +931,6 @@ public void MergeFrom(pb::CodedInputStream input) #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) { uint tag; @@ -1072,7 +1038,6 @@ public void MergeFrom(pb::CodedInputStream input) } - [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")] public sealed partial class MessageOfBullet : pb::IMessage #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE , pb::IBufferMessage @@ -1081,25 +1046,21 @@ public sealed partial class MessageOfBullet : pb::IMessage private static readonly pb::MessageParser _parser = new pb::MessageParser(() => new MessageOfBullet()); private pb::UnknownFieldSet _unknownFields; [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public static pb::MessageParser Parser { get { return _parser; } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public static pbr::MessageDescriptor Descriptor { get { return global::Protobuf.Message2ClientsReflection.Descriptor.MessageTypes[1]; } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] pbr::MessageDescriptor pb::IMessage.Descriptor { get { return Descriptor; } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public MessageOfBullet() { OnConstruction(); @@ -1108,7 +1069,6 @@ public MessageOfBullet() partial void OnConstruction(); [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public MessageOfBullet(MessageOfBullet other) : this() { type_ = other.type_; @@ -1124,7 +1084,6 @@ public MessageOfBullet(MessageOfBullet other) : this() } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public MessageOfBullet Clone() { return new MessageOfBullet(this); @@ -1134,7 +1093,6 @@ public MessageOfBullet Clone() public const int TypeFieldNumber = 1; private global::Protobuf.BulletType type_ = global::Protobuf.BulletType.NullBulletType; [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public global::Protobuf.BulletType Type { get { return type_; } @@ -1148,7 +1106,6 @@ public MessageOfBullet Clone() public const int XFieldNumber = 2; private int x_; [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public int X { get { return x_; } @@ -1162,7 +1119,6 @@ public int X public const int YFieldNumber = 3; private int y_; [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public int Y { get { return y_; } @@ -1176,7 +1132,6 @@ public int Y public const int FacingDirectionFieldNumber = 4; private double facingDirection_; [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public double FacingDirection { get { return facingDirection_; } @@ -1190,7 +1145,6 @@ public double FacingDirection public const int DamageFieldNumber = 5; private int damage_; [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public int Damage { get { return damage_; } @@ -1204,7 +1158,6 @@ public int Damage public const int TeamIdFieldNumber = 6; private long teamId_; [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public long TeamId { get { return teamId_; } @@ -1218,7 +1171,6 @@ public long TeamId public const int GuidFieldNumber = 7; private long guid_; [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public long Guid { get { return guid_; } @@ -1232,7 +1184,6 @@ public long Guid public const int BombRangeFieldNumber = 8; private double bombRange_; [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public double BombRange { get { return bombRange_; } @@ -1246,7 +1197,6 @@ public double BombRange public const int SpeedFieldNumber = 9; private int speed_; [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public int Speed { get { return speed_; } @@ -1257,14 +1207,12 @@ public int Speed } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public override bool Equals(object other) { return Equals(other as MessageOfBullet); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public bool Equals(MessageOfBullet other) { if (ReferenceEquals(other, null)) @@ -1288,7 +1236,6 @@ public bool Equals(MessageOfBullet other) } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public override int GetHashCode() { int hash = 1; @@ -1309,14 +1256,12 @@ public override int GetHashCode() } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public override string ToString() { return pb::JsonFormatter.ToDiagnosticString(this); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public void WriteTo(pb::CodedOutputStream output) { #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE @@ -1366,7 +1311,6 @@ public void WriteTo(pb::CodedOutputStream output) #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) { if (Type != global::Protobuf.BulletType.NullBulletType) @@ -1422,7 +1366,6 @@ public void WriteTo(pb::CodedOutputStream output) #endif [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public int CalculateSize() { int size = 0; @@ -1470,7 +1413,6 @@ public int CalculateSize() } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public void MergeFrom(MessageOfBullet other) { if (other == null) @@ -1517,7 +1459,6 @@ public void MergeFrom(MessageOfBullet other) } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public void MergeFrom(pb::CodedInputStream input) { #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE @@ -1572,7 +1513,6 @@ public void MergeFrom(pb::CodedInputStream input) #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) { uint tag; @@ -1635,7 +1575,6 @@ public void MergeFrom(pb::CodedInputStream input) } - [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")] public sealed partial class MessageOfBombedBullet : pb::IMessage #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE , pb::IBufferMessage @@ -1644,25 +1583,21 @@ public sealed partial class MessageOfBombedBullet : pb::IMessage _parser = new pb::MessageParser(() => new MessageOfBombedBullet()); private pb::UnknownFieldSet _unknownFields; [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public static pb::MessageParser Parser { get { return _parser; } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public static pbr::MessageDescriptor Descriptor { get { return global::Protobuf.Message2ClientsReflection.Descriptor.MessageTypes[2]; } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] pbr::MessageDescriptor pb::IMessage.Descriptor { get { return Descriptor; } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public MessageOfBombedBullet() { OnConstruction(); @@ -1671,7 +1606,6 @@ public MessageOfBombedBullet() partial void OnConstruction(); [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public MessageOfBombedBullet(MessageOfBombedBullet other) : this() { type_ = other.type_; @@ -1684,7 +1618,6 @@ public MessageOfBombedBullet(MessageOfBombedBullet other) : this() } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public MessageOfBombedBullet Clone() { return new MessageOfBombedBullet(this); @@ -1694,7 +1627,6 @@ public MessageOfBombedBullet Clone() public const int TypeFieldNumber = 1; private global::Protobuf.BulletType type_ = global::Protobuf.BulletType.NullBulletType; [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public global::Protobuf.BulletType Type { get { return type_; } @@ -1708,7 +1640,6 @@ public MessageOfBombedBullet Clone() public const int XFieldNumber = 2; private int x_; [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public int X { get { return x_; } @@ -1722,7 +1653,6 @@ public int X public const int YFieldNumber = 3; private int y_; [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public int Y { get { return y_; } @@ -1736,7 +1666,6 @@ public int Y public const int FacingDirectionFieldNumber = 4; private double facingDirection_; [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public double FacingDirection { get { return facingDirection_; } @@ -1750,7 +1679,6 @@ public double FacingDirection public const int MappingIdFieldNumber = 5; private long mappingId_; [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public long MappingId { get { return mappingId_; } @@ -1764,7 +1692,6 @@ public long MappingId public const int BombRangeFieldNumber = 6; private double bombRange_; [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public double BombRange { get { return bombRange_; } @@ -1775,14 +1702,12 @@ public double BombRange } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public override bool Equals(object other) { return Equals(other as MessageOfBombedBullet); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public bool Equals(MessageOfBombedBullet other) { if (ReferenceEquals(other, null)) @@ -1803,7 +1728,6 @@ public bool Equals(MessageOfBombedBullet other) } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public override int GetHashCode() { int hash = 1; @@ -1821,14 +1745,12 @@ public override int GetHashCode() } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public override string ToString() { return pb::JsonFormatter.ToDiagnosticString(this); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public void WriteTo(pb::CodedOutputStream output) { #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE @@ -1866,7 +1788,6 @@ public void WriteTo(pb::CodedOutputStream output) #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) { if (Type != global::Protobuf.BulletType.NullBulletType) @@ -1907,7 +1828,6 @@ public void WriteTo(pb::CodedOutputStream output) #endif [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public int CalculateSize() { int size = 0; @@ -1943,7 +1863,6 @@ public int CalculateSize() } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public void MergeFrom(MessageOfBombedBullet other) { if (other == null) @@ -1978,7 +1897,6 @@ public void MergeFrom(MessageOfBombedBullet other) } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public void MergeFrom(pb::CodedInputStream input) { #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE @@ -2021,7 +1939,6 @@ public void MergeFrom(pb::CodedInputStream input) #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) { uint tag; @@ -2069,7 +1986,6 @@ public void MergeFrom(pb::CodedInputStream input) } - [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")] public sealed partial class MessageOfFactory : pb::IMessage #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE , pb::IBufferMessage @@ -2078,25 +1994,21 @@ public sealed partial class MessageOfFactory : pb::IMessage private static readonly pb::MessageParser _parser = new pb::MessageParser(() => new MessageOfFactory()); private pb::UnknownFieldSet _unknownFields; [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public static pb::MessageParser Parser { get { return _parser; } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public static pbr::MessageDescriptor Descriptor { get { return global::Protobuf.Message2ClientsReflection.Descriptor.MessageTypes[3]; } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] pbr::MessageDescriptor pb::IMessage.Descriptor { get { return Descriptor; } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public MessageOfFactory() { OnConstruction(); @@ -2105,7 +2017,6 @@ public MessageOfFactory() partial void OnConstruction(); [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public MessageOfFactory(MessageOfFactory other) : this() { x_ = other.x_; @@ -2116,7 +2027,6 @@ public MessageOfFactory(MessageOfFactory other) : this() } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public MessageOfFactory Clone() { return new MessageOfFactory(this); @@ -2126,7 +2036,6 @@ public MessageOfFactory Clone() public const int XFieldNumber = 1; private int x_; [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public int X { get { return x_; } @@ -2140,7 +2049,6 @@ public int X public const int YFieldNumber = 2; private int y_; [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public int Y { get { return y_; } @@ -2157,7 +2065,6 @@ public int Y /// 剩余的血量 /// [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public int Hp { get { return hp_; } @@ -2171,7 +2078,6 @@ public int Hp public const int TeamIdFieldNumber = 4; private long teamId_; [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public long TeamId { get { return teamId_; } @@ -2182,14 +2088,12 @@ public long TeamId } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public override bool Equals(object other) { return Equals(other as MessageOfFactory); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public bool Equals(MessageOfFactory other) { if (ReferenceEquals(other, null)) @@ -2208,7 +2112,6 @@ public bool Equals(MessageOfFactory other) } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public override int GetHashCode() { int hash = 1; @@ -2224,14 +2127,12 @@ public override int GetHashCode() } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public override string ToString() { return pb::JsonFormatter.ToDiagnosticString(this); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public void WriteTo(pb::CodedOutputStream output) { #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE @@ -2261,7 +2162,6 @@ public void WriteTo(pb::CodedOutputStream output) #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) { if (X != 0) @@ -2292,7 +2192,6 @@ public void WriteTo(pb::CodedOutputStream output) #endif [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public int CalculateSize() { int size = 0; @@ -2320,7 +2219,6 @@ public int CalculateSize() } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public void MergeFrom(MessageOfFactory other) { if (other == null) @@ -2347,7 +2245,6 @@ public void MergeFrom(MessageOfFactory other) } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public void MergeFrom(pb::CodedInputStream input) { #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE @@ -2382,7 +2279,6 @@ public void MergeFrom(pb::CodedInputStream input) #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) { uint tag; @@ -2420,7 +2316,6 @@ public void MergeFrom(pb::CodedInputStream input) } - [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")] public sealed partial class MessageOfCommunity : pb::IMessage #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE , pb::IBufferMessage @@ -2429,25 +2324,21 @@ public sealed partial class MessageOfCommunity : pb::IMessage _parser = new pb::MessageParser(() => new MessageOfCommunity()); private pb::UnknownFieldSet _unknownFields; [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public static pb::MessageParser Parser { get { return _parser; } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public static pbr::MessageDescriptor Descriptor { get { return global::Protobuf.Message2ClientsReflection.Descriptor.MessageTypes[4]; } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] pbr::MessageDescriptor pb::IMessage.Descriptor { get { return Descriptor; } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public MessageOfCommunity() { OnConstruction(); @@ -2456,7 +2347,6 @@ public MessageOfCommunity() partial void OnConstruction(); [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public MessageOfCommunity(MessageOfCommunity other) : this() { x_ = other.x_; @@ -2467,7 +2357,6 @@ public MessageOfCommunity(MessageOfCommunity other) : this() } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public MessageOfCommunity Clone() { return new MessageOfCommunity(this); @@ -2477,7 +2366,6 @@ public MessageOfCommunity Clone() public const int XFieldNumber = 1; private int x_; [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public int X { get { return x_; } @@ -2491,7 +2379,6 @@ public int X public const int YFieldNumber = 2; private int y_; [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public int Y { get { return y_; } @@ -2508,7 +2395,6 @@ public int Y /// 剩余的血量 /// [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public int Hp { get { return hp_; } @@ -2522,7 +2408,6 @@ public int Hp public const int TeamIdFieldNumber = 4; private long teamId_; [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public long TeamId { get { return teamId_; } @@ -2533,14 +2418,12 @@ public long TeamId } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public override bool Equals(object other) { return Equals(other as MessageOfCommunity); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public bool Equals(MessageOfCommunity other) { if (ReferenceEquals(other, null)) @@ -2559,7 +2442,6 @@ public bool Equals(MessageOfCommunity other) } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public override int GetHashCode() { int hash = 1; @@ -2575,14 +2457,12 @@ public override int GetHashCode() } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public override string ToString() { return pb::JsonFormatter.ToDiagnosticString(this); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public void WriteTo(pb::CodedOutputStream output) { #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE @@ -2612,7 +2492,6 @@ public void WriteTo(pb::CodedOutputStream output) #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) { if (X != 0) @@ -2643,7 +2522,6 @@ public void WriteTo(pb::CodedOutputStream output) #endif [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public int CalculateSize() { int size = 0; @@ -2671,7 +2549,6 @@ public int CalculateSize() } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public void MergeFrom(MessageOfCommunity other) { if (other == null) @@ -2698,7 +2575,6 @@ public void MergeFrom(MessageOfCommunity other) } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public void MergeFrom(pb::CodedInputStream input) { #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE @@ -2733,7 +2609,6 @@ public void MergeFrom(pb::CodedInputStream input) #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) { uint tag; @@ -2771,7 +2646,6 @@ public void MergeFrom(pb::CodedInputStream input) } - [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")] public sealed partial class MessageOfFort : pb::IMessage #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE , pb::IBufferMessage @@ -2780,25 +2654,21 @@ public sealed partial class MessageOfFort : pb::IMessage private static readonly pb::MessageParser _parser = new pb::MessageParser(() => new MessageOfFort()); private pb::UnknownFieldSet _unknownFields; [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public static pb::MessageParser Parser { get { return _parser; } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public static pbr::MessageDescriptor Descriptor { get { return global::Protobuf.Message2ClientsReflection.Descriptor.MessageTypes[5]; } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] pbr::MessageDescriptor pb::IMessage.Descriptor { get { return Descriptor; } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public MessageOfFort() { OnConstruction(); @@ -2807,7 +2677,6 @@ public MessageOfFort() partial void OnConstruction(); [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public MessageOfFort(MessageOfFort other) : this() { x_ = other.x_; @@ -2818,7 +2687,6 @@ public MessageOfFort(MessageOfFort other) : this() } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public MessageOfFort Clone() { return new MessageOfFort(this); @@ -2828,7 +2696,6 @@ public MessageOfFort Clone() public const int XFieldNumber = 1; private int x_; [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public int X { get { return x_; } @@ -2842,7 +2709,6 @@ public int X public const int YFieldNumber = 2; private int y_; [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public int Y { get { return y_; } @@ -2859,7 +2725,6 @@ public int Y /// 剩余的血量 /// [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public int Hp { get { return hp_; } @@ -2873,7 +2738,6 @@ public int Hp public const int TeamIdFieldNumber = 4; private long teamId_; [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public long TeamId { get { return teamId_; } @@ -2884,14 +2748,12 @@ public long TeamId } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public override bool Equals(object other) { return Equals(other as MessageOfFort); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public bool Equals(MessageOfFort other) { if (ReferenceEquals(other, null)) @@ -2910,7 +2772,6 @@ public bool Equals(MessageOfFort other) } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public override int GetHashCode() { int hash = 1; @@ -2926,14 +2787,12 @@ public override int GetHashCode() } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public override string ToString() { return pb::JsonFormatter.ToDiagnosticString(this); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public void WriteTo(pb::CodedOutputStream output) { #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE @@ -2963,7 +2822,6 @@ public void WriteTo(pb::CodedOutputStream output) #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) { if (X != 0) @@ -2994,7 +2852,6 @@ public void WriteTo(pb::CodedOutputStream output) #endif [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public int CalculateSize() { int size = 0; @@ -3022,7 +2879,6 @@ public int CalculateSize() } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public void MergeFrom(MessageOfFort other) { if (other == null) @@ -3049,7 +2905,6 @@ public void MergeFrom(MessageOfFort other) } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public void MergeFrom(pb::CodedInputStream input) { #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE @@ -3084,7 +2939,6 @@ public void MergeFrom(pb::CodedInputStream input) #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) { uint tag; @@ -3122,7 +2976,6 @@ public void MergeFrom(pb::CodedInputStream input) } - [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")] public sealed partial class MessageOfWormhole : pb::IMessage #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE , pb::IBufferMessage @@ -3131,25 +2984,21 @@ public sealed partial class MessageOfWormhole : pb::IMessage private static readonly pb::MessageParser _parser = new pb::MessageParser(() => new MessageOfWormhole()); private pb::UnknownFieldSet _unknownFields; [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public static pb::MessageParser Parser { get { return _parser; } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public static pbr::MessageDescriptor Descriptor { get { return global::Protobuf.Message2ClientsReflection.Descriptor.MessageTypes[6]; } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] pbr::MessageDescriptor pb::IMessage.Descriptor { get { return Descriptor; } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public MessageOfWormhole() { OnConstruction(); @@ -3158,17 +3007,16 @@ public MessageOfWormhole() partial void OnConstruction(); [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public MessageOfWormhole(MessageOfWormhole other) : this() { x_ = other.x_; y_ = other.y_; hp_ = other.hp_; + id_ = other.id_; _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public MessageOfWormhole Clone() { return new MessageOfWormhole(this); @@ -3178,7 +3026,6 @@ public MessageOfWormhole Clone() public const int XFieldNumber = 1; private int x_; [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public int X { get { return x_; } @@ -3192,7 +3039,6 @@ public int X public const int YFieldNumber = 2; private int y_; [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public int Y { get { return y_; } @@ -3209,7 +3055,6 @@ public int Y /// 剩余的血量 /// [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public int Hp { get { return hp_; } @@ -3219,15 +3064,26 @@ public int Hp } } + /// Field number for the "id" field. + public const int IdFieldNumber = 4; + private int id_; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public int Id + { + get { return id_; } + set + { + id_ = value; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public override bool Equals(object other) { return Equals(other as MessageOfWormhole); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public bool Equals(MessageOfWormhole other) { if (ReferenceEquals(other, null)) @@ -3241,17 +3097,18 @@ public bool Equals(MessageOfWormhole other) if (X != other.X) return false; if (Y != other.Y) return false; if (Hp != other.Hp) return false; + if (Id != other.Id) return false; return Equals(_unknownFields, other._unknownFields); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public override int GetHashCode() { int hash = 1; if (X != 0) hash ^= X.GetHashCode(); if (Y != 0) hash ^= Y.GetHashCode(); if (Hp != 0) hash ^= Hp.GetHashCode(); + if (Id != 0) hash ^= Id.GetHashCode(); if (_unknownFields != null) { hash ^= _unknownFields.GetHashCode(); @@ -3260,14 +3117,12 @@ public override int GetHashCode() } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public override string ToString() { return pb::JsonFormatter.ToDiagnosticString(this); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public void WriteTo(pb::CodedOutputStream output) { #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE @@ -3285,6 +3140,10 @@ public void WriteTo(pb::CodedOutputStream output) output.WriteRawTag(24); output.WriteInt32(Hp); } + if (Id != 0) { + output.WriteRawTag(32); + output.WriteInt32(Id); + } if (_unknownFields != null) { _unknownFields.WriteTo(output); } @@ -3293,7 +3152,6 @@ public void WriteTo(pb::CodedOutputStream output) #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) { if (X != 0) @@ -3311,6 +3169,11 @@ public void WriteTo(pb::CodedOutputStream output) output.WriteRawTag(24); output.WriteInt32(Hp); } + if (Id != 0) + { + output.WriteRawTag(32); + output.WriteInt32(Id); + } if (_unknownFields != null) { _unknownFields.WriteTo(ref output); @@ -3319,7 +3182,6 @@ public void WriteTo(pb::CodedOutputStream output) #endif [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public int CalculateSize() { int size = 0; @@ -3335,6 +3197,10 @@ public int CalculateSize() { size += 1 + pb::CodedOutputStream.ComputeInt32Size(Hp); } + if (Id != 0) + { + size += 1 + pb::CodedOutputStream.ComputeInt32Size(Id); + } if (_unknownFields != null) { size += _unknownFields.CalculateSize(); @@ -3343,7 +3209,6 @@ public int CalculateSize() } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public void MergeFrom(MessageOfWormhole other) { if (other == null) @@ -3362,11 +3227,14 @@ public void MergeFrom(MessageOfWormhole other) { Hp = other.Hp; } + if (other.Id != 0) + { + Id = other.Id; + } _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public void MergeFrom(pb::CodedInputStream input) { #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE @@ -3390,6 +3258,10 @@ public void MergeFrom(pb::CodedInputStream input) Hp = input.ReadInt32(); break; } + case 32: { + Id = input.ReadInt32(); + break; + } } } #endif @@ -3397,7 +3269,6 @@ public void MergeFrom(pb::CodedInputStream input) #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) { uint tag; @@ -3423,6 +3294,11 @@ public void MergeFrom(pb::CodedInputStream input) Hp = input.ReadInt32(); break; } + case 32: + { + Id = input.ReadInt32(); + break; + } } } } @@ -3430,7 +3306,6 @@ public void MergeFrom(pb::CodedInputStream input) } - [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")] public sealed partial class MessageOfResource : pb::IMessage #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE , pb::IBufferMessage @@ -3439,25 +3314,21 @@ public sealed partial class MessageOfResource : pb::IMessage private static readonly pb::MessageParser _parser = new pb::MessageParser(() => new MessageOfResource()); private pb::UnknownFieldSet _unknownFields; [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public static pb::MessageParser Parser { get { return _parser; } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public static pbr::MessageDescriptor Descriptor { get { return global::Protobuf.Message2ClientsReflection.Descriptor.MessageTypes[7]; } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] pbr::MessageDescriptor pb::IMessage.Descriptor { get { return Descriptor; } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public MessageOfResource() { OnConstruction(); @@ -3466,7 +3337,6 @@ public MessageOfResource() partial void OnConstruction(); [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public MessageOfResource(MessageOfResource other) : this() { x_ = other.x_; @@ -3476,7 +3346,6 @@ public MessageOfResource(MessageOfResource other) : this() } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public MessageOfResource Clone() { return new MessageOfResource(this); @@ -3486,7 +3355,6 @@ public MessageOfResource Clone() public const int XFieldNumber = 1; private int x_; [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public int X { get { return x_; } @@ -3500,7 +3368,6 @@ public int X public const int YFieldNumber = 2; private int y_; [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public int Y { get { return y_; } @@ -3517,7 +3384,6 @@ public int Y /// 采集进度 /// [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public int Progress { get { return progress_; } @@ -3528,14 +3394,12 @@ public int Progress } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public override bool Equals(object other) { return Equals(other as MessageOfResource); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public bool Equals(MessageOfResource other) { if (ReferenceEquals(other, null)) @@ -3553,7 +3417,6 @@ public bool Equals(MessageOfResource other) } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public override int GetHashCode() { int hash = 1; @@ -3568,14 +3431,12 @@ public override int GetHashCode() } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public override string ToString() { return pb::JsonFormatter.ToDiagnosticString(this); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public void WriteTo(pb::CodedOutputStream output) { #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE @@ -3601,7 +3462,6 @@ public void WriteTo(pb::CodedOutputStream output) #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) { if (X != 0) @@ -3627,7 +3487,6 @@ public void WriteTo(pb::CodedOutputStream output) #endif [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public int CalculateSize() { int size = 0; @@ -3651,7 +3510,6 @@ public int CalculateSize() } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public void MergeFrom(MessageOfResource other) { if (other == null) @@ -3674,7 +3532,6 @@ public void MergeFrom(MessageOfResource other) } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public void MergeFrom(pb::CodedInputStream input) { #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE @@ -3705,7 +3562,6 @@ public void MergeFrom(pb::CodedInputStream input) #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) { uint tag; @@ -3738,7 +3594,6 @@ public void MergeFrom(pb::CodedInputStream input) } - [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")] public sealed partial class MessageOfHome : pb::IMessage #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE , pb::IBufferMessage @@ -3747,25 +3602,21 @@ public sealed partial class MessageOfHome : pb::IMessage private static readonly pb::MessageParser _parser = new pb::MessageParser(() => new MessageOfHome()); private pb::UnknownFieldSet _unknownFields; [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public static pb::MessageParser Parser { get { return _parser; } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public static pbr::MessageDescriptor Descriptor { get { return global::Protobuf.Message2ClientsReflection.Descriptor.MessageTypes[8]; } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] pbr::MessageDescriptor pb::IMessage.Descriptor { get { return Descriptor; } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public MessageOfHome() { OnConstruction(); @@ -3774,7 +3625,6 @@ public MessageOfHome() partial void OnConstruction(); [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public MessageOfHome(MessageOfHome other) : this() { x_ = other.x_; @@ -3785,7 +3635,6 @@ public MessageOfHome(MessageOfHome other) : this() } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public MessageOfHome Clone() { return new MessageOfHome(this); @@ -3795,7 +3644,6 @@ public MessageOfHome Clone() public const int XFieldNumber = 1; private int x_; [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public int X { get { return x_; } @@ -3809,7 +3657,6 @@ public int X public const int YFieldNumber = 2; private int y_; [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public int Y { get { return y_; } @@ -3823,7 +3670,6 @@ public int Y public const int HpFieldNumber = 3; private int hp_; [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public int Hp { get { return hp_; } @@ -3837,7 +3683,6 @@ public int Hp public const int TeamIdFieldNumber = 4; private long teamId_; [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public long TeamId { get { return teamId_; } @@ -3848,14 +3693,12 @@ public long TeamId } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public override bool Equals(object other) { return Equals(other as MessageOfHome); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public bool Equals(MessageOfHome other) { if (ReferenceEquals(other, null)) @@ -3874,7 +3717,6 @@ public bool Equals(MessageOfHome other) } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public override int GetHashCode() { int hash = 1; @@ -3890,14 +3732,12 @@ public override int GetHashCode() } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public override string ToString() { return pb::JsonFormatter.ToDiagnosticString(this); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public void WriteTo(pb::CodedOutputStream output) { #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE @@ -3927,7 +3767,6 @@ public void WriteTo(pb::CodedOutputStream output) #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) { if (X != 0) @@ -3958,7 +3797,6 @@ public void WriteTo(pb::CodedOutputStream output) #endif [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public int CalculateSize() { int size = 0; @@ -3986,7 +3824,6 @@ public int CalculateSize() } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public void MergeFrom(MessageOfHome other) { if (other == null) @@ -4013,7 +3850,6 @@ public void MergeFrom(MessageOfHome other) } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public void MergeFrom(pb::CodedInputStream input) { #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE @@ -4048,7 +3884,6 @@ public void MergeFrom(pb::CodedInputStream input) #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) { uint tag; @@ -4086,7 +3921,6 @@ public void MergeFrom(pb::CodedInputStream input) } - [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")] public sealed partial class MessageOfMap : pb::IMessage #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE , pb::IBufferMessage @@ -4095,25 +3929,21 @@ public sealed partial class MessageOfMap : pb::IMessage private static readonly pb::MessageParser _parser = new pb::MessageParser(() => new MessageOfMap()); private pb::UnknownFieldSet _unknownFields; [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public static pb::MessageParser Parser { get { return _parser; } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public static pbr::MessageDescriptor Descriptor { get { return global::Protobuf.Message2ClientsReflection.Descriptor.MessageTypes[9]; } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] pbr::MessageDescriptor pb::IMessage.Descriptor { get { return Descriptor; } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public MessageOfMap() { OnConstruction(); @@ -4122,7 +3952,6 @@ public MessageOfMap() partial void OnConstruction(); [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public MessageOfMap(MessageOfMap other) : this() { height_ = other.height_; @@ -4132,7 +3961,6 @@ public MessageOfMap(MessageOfMap other) : this() } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public MessageOfMap Clone() { return new MessageOfMap(this); @@ -4142,7 +3970,6 @@ public MessageOfMap Clone() public const int HeightFieldNumber = 1; private uint height_; [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public uint Height { get { return height_; } @@ -4156,7 +3983,6 @@ public uint Height public const int WidthFieldNumber = 2; private uint width_; [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public uint Width { get { return width_; } @@ -4172,21 +3998,18 @@ public uint Width = pb::FieldCodec.ForMessage(26, global::Protobuf.MessageOfMap.Types.Row.Parser); private readonly pbc::RepeatedField rows_ = new pbc::RepeatedField(); [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public pbc::RepeatedField Rows { get { return rows_; } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public override bool Equals(object other) { return Equals(other as MessageOfMap); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public bool Equals(MessageOfMap other) { if (ReferenceEquals(other, null)) @@ -4204,7 +4027,6 @@ public bool Equals(MessageOfMap other) } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public override int GetHashCode() { int hash = 1; @@ -4219,14 +4041,12 @@ public override int GetHashCode() } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public override string ToString() { return pb::JsonFormatter.ToDiagnosticString(this); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public void WriteTo(pb::CodedOutputStream output) { #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE @@ -4249,7 +4069,6 @@ public void WriteTo(pb::CodedOutputStream output) #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) { if (Height != 0) @@ -4271,7 +4090,6 @@ public void WriteTo(pb::CodedOutputStream output) #endif [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public int CalculateSize() { int size = 0; @@ -4292,7 +4110,6 @@ public int CalculateSize() } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public void MergeFrom(MessageOfMap other) { if (other == null) @@ -4312,7 +4129,6 @@ public void MergeFrom(MessageOfMap other) } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public void MergeFrom(pb::CodedInputStream input) { #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE @@ -4343,7 +4159,6 @@ public void MergeFrom(pb::CodedInputStream input) #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) { uint tag; @@ -4377,10 +4192,8 @@ public void MergeFrom(pb::CodedInputStream input) #region Nested types /// Container for nested types declared in the MessageOfMap message type. [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public static partial class Types { - [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")] public sealed partial class Row : pb::IMessage #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE , pb::IBufferMessage @@ -4389,25 +4202,21 @@ public sealed partial class Row : pb::IMessage private static readonly pb::MessageParser _parser = new pb::MessageParser(() => new Row()); private pb::UnknownFieldSet _unknownFields; [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public static pb::MessageParser Parser { get { return _parser; } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public static pbr::MessageDescriptor Descriptor { get { return global::Protobuf.MessageOfMap.Descriptor.NestedTypes[0]; } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] pbr::MessageDescriptor pb::IMessage.Descriptor { get { return Descriptor; } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public Row() { OnConstruction(); @@ -4416,7 +4225,6 @@ public Row() partial void OnConstruction(); [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public Row(Row other) : this() { cols_ = other.cols_.Clone(); @@ -4424,7 +4232,6 @@ public Row(Row other) : this() } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public Row Clone() { return new Row(this); @@ -4436,21 +4243,18 @@ public Row Clone() = pb::FieldCodec.ForEnum(10, x => (int)x, x => (global::Protobuf.PlaceType)x); private readonly pbc::RepeatedField cols_ = new pbc::RepeatedField(); [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public pbc::RepeatedField Cols { get { return cols_; } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public override bool Equals(object other) { return Equals(other as Row); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public bool Equals(Row other) { if (ReferenceEquals(other, null)) @@ -4466,7 +4270,6 @@ public bool Equals(Row other) } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public override int GetHashCode() { int hash = 1; @@ -4479,14 +4282,12 @@ public override int GetHashCode() } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public override string ToString() { return pb::JsonFormatter.ToDiagnosticString(this); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public void WriteTo(pb::CodedOutputStream output) { #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE @@ -4501,7 +4302,6 @@ public void WriteTo(pb::CodedOutputStream output) #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) { cols_.WriteTo(ref output, _repeated_cols_codec); @@ -4513,7 +4313,6 @@ public void WriteTo(pb::CodedOutputStream output) #endif [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public int CalculateSize() { int size = 0; @@ -4526,7 +4325,6 @@ public int CalculateSize() } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public void MergeFrom(Row other) { if (other == null) @@ -4538,7 +4336,6 @@ public void MergeFrom(Row other) } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public void MergeFrom(pb::CodedInputStream input) { #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE @@ -4562,7 +4359,6 @@ public void MergeFrom(pb::CodedInputStream input) #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) { uint tag; @@ -4591,7 +4387,6 @@ public void MergeFrom(pb::CodedInputStream input) } - [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")] public sealed partial class MessageOfTeam : pb::IMessage #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE , pb::IBufferMessage @@ -4600,25 +4395,21 @@ public sealed partial class MessageOfTeam : pb::IMessage private static readonly pb::MessageParser _parser = new pb::MessageParser(() => new MessageOfTeam()); private pb::UnknownFieldSet _unknownFields; [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public static pb::MessageParser Parser { get { return _parser; } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public static pbr::MessageDescriptor Descriptor { get { return global::Protobuf.Message2ClientsReflection.Descriptor.MessageTypes[10]; } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] pbr::MessageDescriptor pb::IMessage.Descriptor { get { return Descriptor; } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public MessageOfTeam() { OnConstruction(); @@ -4627,7 +4418,6 @@ public MessageOfTeam() partial void OnConstruction(); [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public MessageOfTeam(MessageOfTeam other) : this() { teamId_ = other.teamId_; @@ -4638,7 +4428,6 @@ public MessageOfTeam(MessageOfTeam other) : this() } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public MessageOfTeam Clone() { return new MessageOfTeam(this); @@ -4648,7 +4437,6 @@ public MessageOfTeam Clone() public const int TeamIdFieldNumber = 1; private long teamId_; [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public long TeamId { get { return teamId_; } @@ -4662,7 +4450,6 @@ public long TeamId public const int PlayerIdFieldNumber = 2; private long playerId_; [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public long PlayerId { get { return playerId_; } @@ -4676,7 +4463,6 @@ public long PlayerId public const int ScoreFieldNumber = 3; private long score_; [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public long Score { get { return score_; } @@ -4693,7 +4479,6 @@ public long Score /// int64 guid=5; /// [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public long Energy { get { return energy_; } @@ -4704,14 +4489,12 @@ public long Energy } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public override bool Equals(object other) { return Equals(other as MessageOfTeam); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public bool Equals(MessageOfTeam other) { if (ReferenceEquals(other, null)) @@ -4730,7 +4513,6 @@ public bool Equals(MessageOfTeam other) } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public override int GetHashCode() { int hash = 1; @@ -4746,14 +4528,12 @@ public override int GetHashCode() } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public override string ToString() { return pb::JsonFormatter.ToDiagnosticString(this); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public void WriteTo(pb::CodedOutputStream output) { #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE @@ -4783,7 +4563,6 @@ public void WriteTo(pb::CodedOutputStream output) #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) { if (TeamId != 0L) @@ -4814,7 +4593,6 @@ public void WriteTo(pb::CodedOutputStream output) #endif [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public int CalculateSize() { int size = 0; @@ -4842,7 +4620,6 @@ public int CalculateSize() } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public void MergeFrom(MessageOfTeam other) { if (other == null) @@ -4869,7 +4646,6 @@ public void MergeFrom(MessageOfTeam other) } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public void MergeFrom(pb::CodedInputStream input) { #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE @@ -4904,7 +4680,6 @@ public void MergeFrom(pb::CodedInputStream input) #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) { uint tag; @@ -4942,7 +4717,6 @@ public void MergeFrom(pb::CodedInputStream input) } - [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")] public sealed partial class MessageOfObj : pb::IMessage #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE , pb::IBufferMessage @@ -4951,25 +4725,21 @@ public sealed partial class MessageOfObj : pb::IMessage private static readonly pb::MessageParser _parser = new pb::MessageParser(() => new MessageOfObj()); private pb::UnknownFieldSet _unknownFields; [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public static pb::MessageParser Parser { get { return _parser; } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public static pbr::MessageDescriptor Descriptor { get { return global::Protobuf.Message2ClientsReflection.Descriptor.MessageTypes[11]; } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] pbr::MessageDescriptor pb::IMessage.Descriptor { get { return Descriptor; } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public MessageOfObj() { OnConstruction(); @@ -4978,7 +4748,6 @@ public MessageOfObj() partial void OnConstruction(); [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public MessageOfObj(MessageOfObj other) : this() { switch (other.MessageOfObjCase) @@ -5025,7 +4794,6 @@ public MessageOfObj(MessageOfObj other) : this() } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public MessageOfObj Clone() { return new MessageOfObj(this); @@ -5034,7 +4802,6 @@ public MessageOfObj Clone() /// Field number for the "ship_message" field. public const int ShipMessageFieldNumber = 1; [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public global::Protobuf.MessageOfShip ShipMessage { get { return messageOfObjCase_ == MessageOfObjOneofCase.ShipMessage ? (global::Protobuf.MessageOfShip)messageOfObj_ : null; } @@ -5048,7 +4815,6 @@ public MessageOfObj Clone() /// Field number for the "bullet_message" field. public const int BulletMessageFieldNumber = 2; [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public global::Protobuf.MessageOfBullet BulletMessage { get { return messageOfObjCase_ == MessageOfObjOneofCase.BulletMessage ? (global::Protobuf.MessageOfBullet)messageOfObj_ : null; } @@ -5062,7 +4828,6 @@ public MessageOfObj Clone() /// Field number for the "factory_message" field. public const int FactoryMessageFieldNumber = 3; [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public global::Protobuf.MessageOfFactory FactoryMessage { get { return messageOfObjCase_ == MessageOfObjOneofCase.FactoryMessage ? (global::Protobuf.MessageOfFactory)messageOfObj_ : null; } @@ -5076,7 +4841,6 @@ public MessageOfObj Clone() /// Field number for the "community_message" field. public const int CommunityMessageFieldNumber = 4; [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public global::Protobuf.MessageOfCommunity CommunityMessage { get { return messageOfObjCase_ == MessageOfObjOneofCase.CommunityMessage ? (global::Protobuf.MessageOfCommunity)messageOfObj_ : null; } @@ -5090,7 +4854,6 @@ public MessageOfObj Clone() /// Field number for the "fort_message" field. public const int FortMessageFieldNumber = 5; [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public global::Protobuf.MessageOfFort FortMessage { get { return messageOfObjCase_ == MessageOfObjOneofCase.FortMessage ? (global::Protobuf.MessageOfFort)messageOfObj_ : null; } @@ -5104,7 +4867,6 @@ public MessageOfObj Clone() /// Field number for the "wormhole_message" field. public const int WormholeMessageFieldNumber = 6; [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public global::Protobuf.MessageOfWormhole WormholeMessage { get { return messageOfObjCase_ == MessageOfObjOneofCase.WormholeMessage ? (global::Protobuf.MessageOfWormhole)messageOfObj_ : null; } @@ -5118,7 +4880,6 @@ public MessageOfObj Clone() /// Field number for the "home_message" field. public const int HomeMessageFieldNumber = 7; [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public global::Protobuf.MessageOfHome HomeMessage { get { return messageOfObjCase_ == MessageOfObjOneofCase.HomeMessage ? (global::Protobuf.MessageOfHome)messageOfObj_ : null; } @@ -5132,7 +4893,6 @@ public MessageOfObj Clone() /// Field number for the "resource_message" field. public const int ResourceMessageFieldNumber = 8; [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public global::Protobuf.MessageOfResource ResourceMessage { get { return messageOfObjCase_ == MessageOfObjOneofCase.ResourceMessage ? (global::Protobuf.MessageOfResource)messageOfObj_ : null; } @@ -5146,7 +4906,6 @@ public MessageOfObj Clone() /// Field number for the "map_message" field. public const int MapMessageFieldNumber = 9; [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public global::Protobuf.MessageOfMap MapMessage { get { return messageOfObjCase_ == MessageOfObjOneofCase.MapMessage ? (global::Protobuf.MessageOfMap)messageOfObj_ : null; } @@ -5160,7 +4919,6 @@ public MessageOfObj Clone() /// Field number for the "news_message" field. public const int NewsMessageFieldNumber = 10; [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public global::Protobuf.MessageOfNews NewsMessage { get { return messageOfObjCase_ == MessageOfObjOneofCase.NewsMessage ? (global::Protobuf.MessageOfNews)messageOfObj_ : null; } @@ -5174,7 +4932,6 @@ public MessageOfObj Clone() /// Field number for the "bombed_bullet_message" field. public const int BombedBulletMessageFieldNumber = 11; [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public global::Protobuf.MessageOfBombedBullet BombedBulletMessage { get { return messageOfObjCase_ == MessageOfObjOneofCase.BombedBulletMessage ? (global::Protobuf.MessageOfBombedBullet)messageOfObj_ : null; } @@ -5188,7 +4945,6 @@ public MessageOfObj Clone() /// Field number for the "team_message" field. public const int TeamMessageFieldNumber = 12; [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public global::Protobuf.MessageOfTeam TeamMessage { get { return messageOfObjCase_ == MessageOfObjOneofCase.TeamMessage ? (global::Protobuf.MessageOfTeam)messageOfObj_ : null; } @@ -5219,14 +4975,13 @@ public enum MessageOfObjOneofCase } private MessageOfObjOneofCase messageOfObjCase_ = MessageOfObjOneofCase.None; [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + [JsonIgnore] public MessageOfObjOneofCase MessageOfObjCase { get { return messageOfObjCase_; } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public void ClearMessageOfObj() { messageOfObjCase_ = MessageOfObjOneofCase.None; @@ -5234,14 +4989,12 @@ public void ClearMessageOfObj() } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public override bool Equals(object other) { return Equals(other as MessageOfObj); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public bool Equals(MessageOfObj other) { if (ReferenceEquals(other, null)) @@ -5269,7 +5022,6 @@ public bool Equals(MessageOfObj other) } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public override int GetHashCode() { int hash = 1; @@ -5294,14 +5046,12 @@ public override int GetHashCode() } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public override string ToString() { return pb::JsonFormatter.ToDiagnosticString(this); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public void WriteTo(pb::CodedOutputStream output) { #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE @@ -5363,7 +5113,6 @@ public void WriteTo(pb::CodedOutputStream output) #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) { if (messageOfObjCase_ == MessageOfObjOneofCase.ShipMessage) @@ -5434,7 +5183,6 @@ public void WriteTo(pb::CodedOutputStream output) #endif [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public int CalculateSize() { int size = 0; @@ -5494,7 +5242,6 @@ public int CalculateSize() } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public void MergeFrom(MessageOfObj other) { if (other == null) @@ -5593,7 +5340,6 @@ public void MergeFrom(MessageOfObj other) } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public void MergeFrom(pb::CodedInputStream input) { #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE @@ -5720,7 +5466,6 @@ public void MergeFrom(pb::CodedInputStream input) #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) { uint tag; @@ -5870,7 +5615,6 @@ public void MergeFrom(pb::CodedInputStream input) } - [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")] public sealed partial class MessageOfAll : pb::IMessage #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE , pb::IBufferMessage @@ -5879,25 +5623,21 @@ public sealed partial class MessageOfAll : pb::IMessage private static readonly pb::MessageParser _parser = new pb::MessageParser(() => new MessageOfAll()); private pb::UnknownFieldSet _unknownFields; [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public static pb::MessageParser Parser { get { return _parser; } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public static pbr::MessageDescriptor Descriptor { get { return global::Protobuf.Message2ClientsReflection.Descriptor.MessageTypes[12]; } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] pbr::MessageDescriptor pb::IMessage.Descriptor { get { return Descriptor; } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public MessageOfAll() { OnConstruction(); @@ -5906,7 +5646,6 @@ public MessageOfAll() partial void OnConstruction(); [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public MessageOfAll(MessageOfAll other) : this() { gameTime_ = other.gameTime_; @@ -5920,7 +5659,6 @@ public MessageOfAll(MessageOfAll other) : this() } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public MessageOfAll Clone() { return new MessageOfAll(this); @@ -5930,7 +5668,6 @@ public MessageOfAll Clone() public const int GameTimeFieldNumber = 1; private int gameTime_; [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public int GameTime { get { return gameTime_; } @@ -5944,7 +5681,6 @@ public int GameTime public const int RedTeamScoreFieldNumber = 2; private int redTeamScore_; [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public int RedTeamScore { get { return redTeamScore_; } @@ -5958,7 +5694,6 @@ public int RedTeamScore public const int BlueTeamScoreFieldNumber = 3; private int blueTeamScore_; [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public int BlueTeamScore { get { return blueTeamScore_; } @@ -5972,7 +5707,6 @@ public int BlueTeamScore public const int RedTeamEnergyFieldNumber = 4; private int redTeamEnergy_; [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public int RedTeamEnergy { get { return redTeamEnergy_; } @@ -5986,7 +5720,6 @@ public int RedTeamEnergy public const int BlueTeamEnergyFieldNumber = 5; private int blueTeamEnergy_; [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public int BlueTeamEnergy { get { return blueTeamEnergy_; } @@ -6000,7 +5733,6 @@ public int BlueTeamEnergy public const int RedHomeHpFieldNumber = 6; private int redHomeHp_; [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public int RedHomeHp { get { return redHomeHp_; } @@ -6014,7 +5746,6 @@ public int RedHomeHp public const int BlueHomeHpFieldNumber = 7; private int blueHomeHp_; [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public int BlueHomeHp { get { return blueHomeHp_; } @@ -6025,14 +5756,12 @@ public int BlueHomeHp } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public override bool Equals(object other) { return Equals(other as MessageOfAll); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public bool Equals(MessageOfAll other) { if (ReferenceEquals(other, null)) @@ -6054,7 +5783,6 @@ public bool Equals(MessageOfAll other) } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public override int GetHashCode() { int hash = 1; @@ -6073,14 +5801,12 @@ public override int GetHashCode() } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public override string ToString() { return pb::JsonFormatter.ToDiagnosticString(this); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public void WriteTo(pb::CodedOutputStream output) { #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE @@ -6122,7 +5848,6 @@ public void WriteTo(pb::CodedOutputStream output) #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) { if (GameTime != 0) @@ -6168,7 +5893,6 @@ public void WriteTo(pb::CodedOutputStream output) #endif [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public int CalculateSize() { int size = 0; @@ -6208,7 +5932,6 @@ public int CalculateSize() } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public void MergeFrom(MessageOfAll other) { if (other == null) @@ -6247,7 +5970,6 @@ public void MergeFrom(MessageOfAll other) } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public void MergeFrom(pb::CodedInputStream input) { #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE @@ -6294,7 +6016,6 @@ public void MergeFrom(pb::CodedInputStream input) #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) { uint tag; @@ -6347,7 +6068,6 @@ public void MergeFrom(pb::CodedInputStream input) } - [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")] public sealed partial class MessageToClient : pb::IMessage #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE , pb::IBufferMessage @@ -6356,25 +6076,21 @@ public sealed partial class MessageToClient : pb::IMessage private static readonly pb::MessageParser _parser = new pb::MessageParser(() => new MessageToClient()); private pb::UnknownFieldSet _unknownFields; [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public static pb::MessageParser Parser { get { return _parser; } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public static pbr::MessageDescriptor Descriptor { get { return global::Protobuf.Message2ClientsReflection.Descriptor.MessageTypes[13]; } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] pbr::MessageDescriptor pb::IMessage.Descriptor { get { return Descriptor; } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public MessageToClient() { OnConstruction(); @@ -6383,7 +6099,6 @@ public MessageToClient() partial void OnConstruction(); [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public MessageToClient(MessageToClient other) : this() { objMessage_ = other.objMessage_.Clone(); @@ -6393,7 +6108,6 @@ public MessageToClient(MessageToClient other) : this() } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public MessageToClient Clone() { return new MessageToClient(this); @@ -6405,7 +6119,6 @@ public MessageToClient Clone() = pb::FieldCodec.ForMessage(10, global::Protobuf.MessageOfObj.Parser); private readonly pbc::RepeatedField objMessage_ = new pbc::RepeatedField(); [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public pbc::RepeatedField ObjMessage { get { return objMessage_; } @@ -6415,7 +6128,6 @@ public MessageToClient Clone() public const int GameStateFieldNumber = 2; private global::Protobuf.GameState gameState_ = global::Protobuf.GameState.NullGameState; [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public global::Protobuf.GameState GameState { get { return gameState_; } @@ -6429,7 +6141,6 @@ public MessageToClient Clone() public const int AllMessageFieldNumber = 3; private global::Protobuf.MessageOfAll allMessage_; [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public global::Protobuf.MessageOfAll AllMessage { get { return allMessage_; } @@ -6440,14 +6151,12 @@ public MessageToClient Clone() } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public override bool Equals(object other) { return Equals(other as MessageToClient); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public bool Equals(MessageToClient other) { if (ReferenceEquals(other, null)) @@ -6465,7 +6174,6 @@ public bool Equals(MessageToClient other) } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public override int GetHashCode() { int hash = 1; @@ -6480,14 +6188,12 @@ public override int GetHashCode() } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public override string ToString() { return pb::JsonFormatter.ToDiagnosticString(this); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public void WriteTo(pb::CodedOutputStream output) { #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE @@ -6510,7 +6216,6 @@ public void WriteTo(pb::CodedOutputStream output) #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) { objMessage_.WriteTo(ref output, _repeated_objMessage_codec); @@ -6532,7 +6237,6 @@ public void WriteTo(pb::CodedOutputStream output) #endif [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public int CalculateSize() { int size = 0; @@ -6553,7 +6257,6 @@ public int CalculateSize() } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public void MergeFrom(MessageToClient other) { if (other == null) @@ -6577,7 +6280,6 @@ public void MergeFrom(MessageToClient other) } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public void MergeFrom(pb::CodedInputStream input) { #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE @@ -6611,7 +6313,6 @@ public void MergeFrom(pb::CodedInputStream input) #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) { uint tag; @@ -6648,7 +6349,6 @@ public void MergeFrom(pb::CodedInputStream input) } - [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")] public sealed partial class MoveRes : pb::IMessage #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE , pb::IBufferMessage @@ -6657,25 +6357,21 @@ public sealed partial class MoveRes : pb::IMessage private static readonly pb::MessageParser _parser = new pb::MessageParser(() => new MoveRes()); private pb::UnknownFieldSet _unknownFields; [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public static pb::MessageParser Parser { get { return _parser; } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public static pbr::MessageDescriptor Descriptor { get { return global::Protobuf.Message2ClientsReflection.Descriptor.MessageTypes[14]; } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] pbr::MessageDescriptor pb::IMessage.Descriptor { get { return Descriptor; } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public MoveRes() { OnConstruction(); @@ -6684,7 +6380,6 @@ public MoveRes() partial void OnConstruction(); [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public MoveRes(MoveRes other) : this() { actualSpeed_ = other.actualSpeed_; @@ -6694,7 +6389,6 @@ public MoveRes(MoveRes other) : this() } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public MoveRes Clone() { return new MoveRes(this); @@ -6704,7 +6398,6 @@ public MoveRes Clone() public const int ActualSpeedFieldNumber = 1; private long actualSpeed_; [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public long ActualSpeed { get { return actualSpeed_; } @@ -6718,7 +6411,6 @@ public long ActualSpeed public const int ActualAngleFieldNumber = 2; private double actualAngle_; [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public double ActualAngle { get { return actualAngle_; } @@ -6732,7 +6424,6 @@ public double ActualAngle public const int ActSuccessFieldNumber = 3; private bool actSuccess_; [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public bool ActSuccess { get { return actSuccess_; } @@ -6743,14 +6434,12 @@ public bool ActSuccess } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public override bool Equals(object other) { return Equals(other as MoveRes); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public bool Equals(MoveRes other) { if (ReferenceEquals(other, null)) @@ -6768,7 +6457,6 @@ public bool Equals(MoveRes other) } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public override int GetHashCode() { int hash = 1; @@ -6783,14 +6471,12 @@ public override int GetHashCode() } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public override string ToString() { return pb::JsonFormatter.ToDiagnosticString(this); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public void WriteTo(pb::CodedOutputStream output) { #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE @@ -6816,7 +6502,6 @@ public void WriteTo(pb::CodedOutputStream output) #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) { if (ActualSpeed != 0L) @@ -6842,7 +6527,6 @@ public void WriteTo(pb::CodedOutputStream output) #endif [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public int CalculateSize() { int size = 0; @@ -6866,7 +6550,6 @@ public int CalculateSize() } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public void MergeFrom(MoveRes other) { if (other == null) @@ -6889,7 +6572,6 @@ public void MergeFrom(MoveRes other) } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public void MergeFrom(pb::CodedInputStream input) { #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE @@ -6920,7 +6602,6 @@ public void MergeFrom(pb::CodedInputStream input) #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) { uint tag; @@ -6953,7 +6634,6 @@ public void MergeFrom(pb::CodedInputStream input) } - [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")] public sealed partial class BuildShipRes : pb::IMessage #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE , pb::IBufferMessage @@ -6962,25 +6642,21 @@ public sealed partial class BuildShipRes : pb::IMessage private static readonly pb::MessageParser _parser = new pb::MessageParser(() => new BuildShipRes()); private pb::UnknownFieldSet _unknownFields; [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public static pb::MessageParser Parser { get { return _parser; } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public static pbr::MessageDescriptor Descriptor { get { return global::Protobuf.Message2ClientsReflection.Descriptor.MessageTypes[15]; } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] pbr::MessageDescriptor pb::IMessage.Descriptor { get { return Descriptor; } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public BuildShipRes() { OnConstruction(); @@ -6989,7 +6665,6 @@ public BuildShipRes() partial void OnConstruction(); [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public BuildShipRes(BuildShipRes other) : this() { actSuccess_ = other.actSuccess_; @@ -6998,7 +6673,6 @@ public BuildShipRes(BuildShipRes other) : this() } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public BuildShipRes Clone() { return new BuildShipRes(this); @@ -7008,7 +6682,6 @@ public BuildShipRes Clone() public const int ActSuccessFieldNumber = 1; private bool actSuccess_; [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public bool ActSuccess { get { return actSuccess_; } @@ -7022,7 +6695,6 @@ public bool ActSuccess public const int PlayerIdFieldNumber = 2; private long playerId_; [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public long PlayerId { get { return playerId_; } @@ -7033,14 +6705,12 @@ public long PlayerId } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public override bool Equals(object other) { return Equals(other as BuildShipRes); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public bool Equals(BuildShipRes other) { if (ReferenceEquals(other, null)) @@ -7057,7 +6727,6 @@ public bool Equals(BuildShipRes other) } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public override int GetHashCode() { int hash = 1; @@ -7071,14 +6740,12 @@ public override int GetHashCode() } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public override string ToString() { return pb::JsonFormatter.ToDiagnosticString(this); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public void WriteTo(pb::CodedOutputStream output) { #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE @@ -7100,7 +6767,6 @@ public void WriteTo(pb::CodedOutputStream output) #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) { if (ActSuccess != false) @@ -7121,7 +6787,6 @@ public void WriteTo(pb::CodedOutputStream output) #endif [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public int CalculateSize() { int size = 0; @@ -7141,7 +6806,6 @@ public int CalculateSize() } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public void MergeFrom(BuildShipRes other) { if (other == null) @@ -7160,7 +6824,6 @@ public void MergeFrom(BuildShipRes other) } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public void MergeFrom(pb::CodedInputStream input) { #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE @@ -7187,7 +6850,6 @@ public void MergeFrom(pb::CodedInputStream input) #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) { uint tag; @@ -7215,7 +6877,6 @@ public void MergeFrom(pb::CodedInputStream input) } - [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")] public sealed partial class BoolRes : pb::IMessage #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE , pb::IBufferMessage @@ -7224,25 +6885,21 @@ public sealed partial class BoolRes : pb::IMessage private static readonly pb::MessageParser _parser = new pb::MessageParser(() => new BoolRes()); private pb::UnknownFieldSet _unknownFields; [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public static pb::MessageParser Parser { get { return _parser; } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public static pbr::MessageDescriptor Descriptor { get { return global::Protobuf.Message2ClientsReflection.Descriptor.MessageTypes[16]; } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] pbr::MessageDescriptor pb::IMessage.Descriptor { get { return Descriptor; } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public BoolRes() { OnConstruction(); @@ -7251,7 +6908,6 @@ public BoolRes() partial void OnConstruction(); [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public BoolRes(BoolRes other) : this() { actSuccess_ = other.actSuccess_; @@ -7259,7 +6915,6 @@ public BoolRes(BoolRes other) : this() } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public BoolRes Clone() { return new BoolRes(this); @@ -7269,7 +6924,6 @@ public BoolRes Clone() public const int ActSuccessFieldNumber = 1; private bool actSuccess_; [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public bool ActSuccess { get { return actSuccess_; } @@ -7280,14 +6934,12 @@ public bool ActSuccess } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public override bool Equals(object other) { return Equals(other as BoolRes); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public bool Equals(BoolRes other) { if (ReferenceEquals(other, null)) @@ -7303,7 +6955,6 @@ public bool Equals(BoolRes other) } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public override int GetHashCode() { int hash = 1; @@ -7316,14 +6967,12 @@ public override int GetHashCode() } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public override string ToString() { return pb::JsonFormatter.ToDiagnosticString(this); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public void WriteTo(pb::CodedOutputStream output) { #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE @@ -7341,7 +6990,6 @@ public void WriteTo(pb::CodedOutputStream output) #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) { if (ActSuccess != false) @@ -7357,7 +7005,6 @@ public void WriteTo(pb::CodedOutputStream output) #endif [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public int CalculateSize() { int size = 0; @@ -7373,7 +7020,6 @@ public int CalculateSize() } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public void MergeFrom(BoolRes other) { if (other == null) @@ -7388,7 +7034,6 @@ public void MergeFrom(BoolRes other) } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public void MergeFrom(pb::CodedInputStream input) { #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE @@ -7411,7 +7056,6 @@ public void MergeFrom(pb::CodedInputStream input) #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) { uint tag; @@ -7434,7 +7078,6 @@ public void MergeFrom(pb::CodedInputStream input) } - [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")] public sealed partial class ShipInfoRes : pb::IMessage #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE , pb::IBufferMessage @@ -7443,25 +7086,21 @@ public sealed partial class ShipInfoRes : pb::IMessage private static readonly pb::MessageParser _parser = new pb::MessageParser(() => new ShipInfoRes()); private pb::UnknownFieldSet _unknownFields; [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public static pb::MessageParser Parser { get { return _parser; } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public static pbr::MessageDescriptor Descriptor { get { return global::Protobuf.Message2ClientsReflection.Descriptor.MessageTypes[17]; } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] pbr::MessageDescriptor pb::IMessage.Descriptor { get { return Descriptor; } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public ShipInfoRes() { OnConstruction(); @@ -7470,7 +7109,6 @@ public ShipInfoRes() partial void OnConstruction(); [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public ShipInfoRes(ShipInfoRes other) : this() { shipInfo_ = other.shipInfo_.Clone(); @@ -7478,7 +7116,6 @@ public ShipInfoRes(ShipInfoRes other) : this() } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public ShipInfoRes Clone() { return new ShipInfoRes(this); @@ -7490,21 +7127,18 @@ public ShipInfoRes Clone() = pb::FieldCodec.ForMessage(10, global::Protobuf.MessageOfShip.Parser); private readonly pbc::RepeatedField shipInfo_ = new pbc::RepeatedField(); [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public pbc::RepeatedField ShipInfo { get { return shipInfo_; } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public override bool Equals(object other) { return Equals(other as ShipInfoRes); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public bool Equals(ShipInfoRes other) { if (ReferenceEquals(other, null)) @@ -7520,7 +7154,6 @@ public bool Equals(ShipInfoRes other) } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public override int GetHashCode() { int hash = 1; @@ -7533,14 +7166,12 @@ public override int GetHashCode() } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public override string ToString() { return pb::JsonFormatter.ToDiagnosticString(this); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public void WriteTo(pb::CodedOutputStream output) { #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE @@ -7555,7 +7186,6 @@ public void WriteTo(pb::CodedOutputStream output) #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) { shipInfo_.WriteTo(ref output, _repeated_shipInfo_codec); @@ -7567,7 +7197,6 @@ public void WriteTo(pb::CodedOutputStream output) #endif [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public int CalculateSize() { int size = 0; @@ -7580,7 +7209,6 @@ public int CalculateSize() } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public void MergeFrom(ShipInfoRes other) { if (other == null) @@ -7592,7 +7220,6 @@ public void MergeFrom(ShipInfoRes other) } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public void MergeFrom(pb::CodedInputStream input) { #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE @@ -7615,7 +7242,6 @@ public void MergeFrom(pb::CodedInputStream input) #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) { uint tag; @@ -7638,7 +7264,6 @@ public void MergeFrom(pb::CodedInputStream input) } - [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")] public sealed partial class EcoRes : pb::IMessage #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE , pb::IBufferMessage @@ -7647,25 +7272,21 @@ public sealed partial class EcoRes : pb::IMessage private static readonly pb::MessageParser _parser = new pb::MessageParser(() => new EcoRes()); private pb::UnknownFieldSet _unknownFields; [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public static pb::MessageParser Parser { get { return _parser; } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public static pbr::MessageDescriptor Descriptor { get { return global::Protobuf.Message2ClientsReflection.Descriptor.MessageTypes[18]; } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] pbr::MessageDescriptor pb::IMessage.Descriptor { get { return Descriptor; } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public EcoRes() { OnConstruction(); @@ -7674,7 +7295,6 @@ public EcoRes() partial void OnConstruction(); [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public EcoRes(EcoRes other) : this() { economy_ = other.economy_; @@ -7682,7 +7302,6 @@ public EcoRes(EcoRes other) : this() } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public EcoRes Clone() { return new EcoRes(this); @@ -7692,7 +7311,6 @@ public EcoRes Clone() public const int EconomyFieldNumber = 1; private long economy_; [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public long Economy { get { return economy_; } @@ -7703,14 +7321,12 @@ public long Economy } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public override bool Equals(object other) { return Equals(other as EcoRes); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public bool Equals(EcoRes other) { if (ReferenceEquals(other, null)) @@ -7726,7 +7342,6 @@ public bool Equals(EcoRes other) } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public override int GetHashCode() { int hash = 1; @@ -7739,14 +7354,12 @@ public override int GetHashCode() } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public override string ToString() { return pb::JsonFormatter.ToDiagnosticString(this); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public void WriteTo(pb::CodedOutputStream output) { #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE @@ -7764,7 +7377,6 @@ public void WriteTo(pb::CodedOutputStream output) #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) { if (Economy != 0L) @@ -7780,7 +7392,6 @@ public void WriteTo(pb::CodedOutputStream output) #endif [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public int CalculateSize() { int size = 0; @@ -7796,7 +7407,6 @@ public int CalculateSize() } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public void MergeFrom(EcoRes other) { if (other == null) @@ -7811,7 +7421,6 @@ public void MergeFrom(EcoRes other) } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public void MergeFrom(pb::CodedInputStream input) { #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE @@ -7834,7 +7443,6 @@ public void MergeFrom(pb::CodedInputStream input) #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) { uint tag; @@ -7857,7 +7465,6 @@ public void MergeFrom(pb::CodedInputStream input) } - [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")] public sealed partial class MessageOfNews : pb::IMessage #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE , pb::IBufferMessage @@ -7866,25 +7473,21 @@ public sealed partial class MessageOfNews : pb::IMessage private static readonly pb::MessageParser _parser = new pb::MessageParser(() => new MessageOfNews()); private pb::UnknownFieldSet _unknownFields; [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public static pb::MessageParser Parser { get { return _parser; } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public static pbr::MessageDescriptor Descriptor { get { return global::Protobuf.Message2ClientsReflection.Descriptor.MessageTypes[19]; } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] pbr::MessageDescriptor pb::IMessage.Descriptor { get { return Descriptor; } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public MessageOfNews() { OnConstruction(); @@ -7893,7 +7496,6 @@ public MessageOfNews() partial void OnConstruction(); [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public MessageOfNews(MessageOfNews other) : this() { fromId_ = other.fromId_; @@ -7913,7 +7515,6 @@ public MessageOfNews(MessageOfNews other) : this() } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public MessageOfNews Clone() { return new MessageOfNews(this); @@ -7922,70 +7523,33 @@ public MessageOfNews Clone() /// Field number for the "text_message" field. public const int TextMessageFieldNumber = 1; [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public string TextMessage { - get { return HasTextMessage ? (string)news_ : ""; } + get { return newsCase_ == NewsOneofCase.TextMessage ? (string)news_ : ""; } set { news_ = pb::ProtoPreconditions.CheckNotNull(value, "value"); newsCase_ = NewsOneofCase.TextMessage; } } - /// Gets whether the "text_message" field is set - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] - public bool HasTextMessage - { - get { return newsCase_ == NewsOneofCase.TextMessage; } - } - /// Clears the value of the oneof if it's currently set to "text_message" - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] - public void ClearTextMessage() - { - if (HasTextMessage) - { - ClearNews(); - } - } /// Field number for the "binary_message" field. public const int BinaryMessageFieldNumber = 2; [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public pb::ByteString BinaryMessage { - get { return HasBinaryMessage ? (pb::ByteString)news_ : pb::ByteString.Empty; } + get { return newsCase_ == NewsOneofCase.BinaryMessage ? (pb::ByteString)news_ : pb::ByteString.Empty; } set { news_ = pb::ProtoPreconditions.CheckNotNull(value, "value"); newsCase_ = NewsOneofCase.BinaryMessage; } } - /// Gets whether the "binary_message" field is set - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] - public bool HasBinaryMessage - { - get { return newsCase_ == NewsOneofCase.BinaryMessage; } - } - /// Clears the value of the oneof if it's currently set to "binary_message" - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] - public void ClearBinaryMessage() - { - if (HasBinaryMessage) - { - ClearNews(); - } - } /// Field number for the "from_id" field. public const int FromIdFieldNumber = 3; private long fromId_; [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public long FromId { get { return fromId_; } @@ -7999,7 +7563,6 @@ public long FromId public const int ToIdFieldNumber = 4; private long toId_; [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public long ToId { get { return toId_; } @@ -8013,7 +7576,6 @@ public long ToId public const int TeamIdFieldNumber = 5; private long teamId_; [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public long TeamId { get { return teamId_; } @@ -8033,14 +7595,13 @@ public enum NewsOneofCase } private NewsOneofCase newsCase_ = NewsOneofCase.None; [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + [JsonIgnore] public NewsOneofCase NewsCase { get { return newsCase_; } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public void ClearNews() { newsCase_ = NewsOneofCase.None; @@ -8048,14 +7609,12 @@ public void ClearNews() } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public override bool Equals(object other) { return Equals(other as MessageOfNews); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public bool Equals(MessageOfNews other) { if (ReferenceEquals(other, null)) @@ -8076,12 +7635,11 @@ public bool Equals(MessageOfNews other) } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public override int GetHashCode() { int hash = 1; - if (HasTextMessage) hash ^= TextMessage.GetHashCode(); - if (HasBinaryMessage) hash ^= BinaryMessage.GetHashCode(); + if (newsCase_ == NewsOneofCase.TextMessage) hash ^= TextMessage.GetHashCode(); + if (newsCase_ == NewsOneofCase.BinaryMessage) hash ^= BinaryMessage.GetHashCode(); if (FromId != 0L) hash ^= FromId.GetHashCode(); if (ToId != 0L) hash ^= ToId.GetHashCode(); if (TeamId != 0L) hash ^= TeamId.GetHashCode(); @@ -8094,24 +7652,22 @@ public override int GetHashCode() } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public override string ToString() { return pb::JsonFormatter.ToDiagnosticString(this); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public void WriteTo(pb::CodedOutputStream output) { #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE output.WriteRawMessage(this); #else - if (HasTextMessage) { + if (newsCase_ == NewsOneofCase.TextMessage) { output.WriteRawTag(10); output.WriteString(TextMessage); } - if (HasBinaryMessage) { + if (newsCase_ == NewsOneofCase.BinaryMessage) { output.WriteRawTag(18); output.WriteBytes(BinaryMessage); } @@ -8135,15 +7691,14 @@ public void WriteTo(pb::CodedOutputStream output) #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) { - if (HasTextMessage) + if (newsCase_ == NewsOneofCase.TextMessage) { output.WriteRawTag(10); output.WriteString(TextMessage); } - if (HasBinaryMessage) + if (newsCase_ == NewsOneofCase.BinaryMessage) { output.WriteRawTag(18); output.WriteBytes(BinaryMessage); @@ -8171,15 +7726,14 @@ public void WriteTo(pb::CodedOutputStream output) #endif [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public int CalculateSize() { int size = 0; - if (HasTextMessage) + if (newsCase_ == NewsOneofCase.TextMessage) { size += 1 + pb::CodedOutputStream.ComputeStringSize(TextMessage); } - if (HasBinaryMessage) + if (newsCase_ == NewsOneofCase.BinaryMessage) { size += 1 + pb::CodedOutputStream.ComputeBytesSize(BinaryMessage); } @@ -8203,7 +7757,6 @@ public int CalculateSize() } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public void MergeFrom(MessageOfNews other) { if (other == null) @@ -8236,7 +7789,6 @@ public void MergeFrom(MessageOfNews other) } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public void MergeFrom(pb::CodedInputStream input) { #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE @@ -8275,7 +7827,6 @@ public void MergeFrom(pb::CodedInputStream input) #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) { uint tag; diff --git a/interface/interface_live/Assets/Scripts/Define/Message2ClientsGrpc.cs b/interface/interface_live/Assets/Scripts/Define/Message2ClientsGrpc.cs new file mode 100644 index 00000000..e69de29b diff --git a/interface/interface_live/Assets/Scripts/Define/Message2ClientsGrpc.cs.meta b/interface/interface_live/Assets/Scripts/Define/Message2ClientsGrpc.cs.meta new file mode 100644 index 00000000..07ef01b2 --- /dev/null +++ b/interface/interface_live/Assets/Scripts/Define/Message2ClientsGrpc.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 3f248a197f4e0404eb931dcf497e0998 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/interface/interface_live/Assets/Scripts/Define/Message2Server.cs b/interface/interface_live/Assets/Scripts/Define/Message2Server.cs index 46f6f269..a60d2a91 100644 --- a/interface/interface_live/Assets/Scripts/Define/Message2Server.cs +++ b/interface/interface_live/Assets/Scripts/Define/Message2Server.cs @@ -2,7 +2,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: Message2Server.proto // -#pragma warning disable 1591, 0612, 3021, 8981 +#pragma warning disable 1591, 0612, 3021 #region Designer generated code using pb = global::Google.Protobuf; @@ -63,7 +63,6 @@ static Message2ServerReflection() { } #region Messages - [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")] public sealed partial class NullRequest : pb::IMessage #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE , pb::IBufferMessage @@ -72,23 +71,19 @@ public sealed partial class NullRequest : pb::IMessage private static readonly pb::MessageParser _parser = new pb::MessageParser(() => new NullRequest()); private pb::UnknownFieldSet _unknownFields; [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public static pb::MessageParser Parser { get { return _parser; } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public static pbr::MessageDescriptor Descriptor { get { return global::Protobuf.Message2ServerReflection.Descriptor.MessageTypes[0]; } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] pbr::MessageDescriptor pb::IMessage.Descriptor { get { return Descriptor; } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public NullRequest() { OnConstruction(); } @@ -96,25 +91,21 @@ public NullRequest() { partial void OnConstruction(); [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public NullRequest(NullRequest other) : this() { _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public NullRequest Clone() { return new NullRequest(this); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public override bool Equals(object other) { return Equals(other as NullRequest); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public bool Equals(NullRequest other) { if (ReferenceEquals(other, null)) { return false; @@ -126,7 +117,6 @@ public bool Equals(NullRequest other) { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public override int GetHashCode() { int hash = 1; if (_unknownFields != null) { @@ -136,13 +126,11 @@ public override int GetHashCode() { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public override string ToString() { return pb::JsonFormatter.ToDiagnosticString(this); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public void WriteTo(pb::CodedOutputStream output) { #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE output.WriteRawMessage(this); @@ -155,7 +143,6 @@ public void WriteTo(pb::CodedOutputStream output) { #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) { if (_unknownFields != null) { _unknownFields.WriteTo(ref output); @@ -164,7 +151,6 @@ public void WriteTo(pb::CodedOutputStream output) { #endif [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public int CalculateSize() { int size = 0; if (_unknownFields != null) { @@ -174,7 +160,6 @@ public int CalculateSize() { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public void MergeFrom(NullRequest other) { if (other == null) { return; @@ -183,7 +168,6 @@ public void MergeFrom(NullRequest other) { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public void MergeFrom(pb::CodedInputStream input) { #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE input.ReadRawMessage(this); @@ -201,7 +185,6 @@ public void MergeFrom(pb::CodedInputStream input) { #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) { uint tag; while ((tag = input.ReadTag()) != 0) { @@ -216,7 +199,6 @@ public void MergeFrom(pb::CodedInputStream input) { } - [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")] public sealed partial class IDMsg : pb::IMessage #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE , pb::IBufferMessage @@ -225,23 +207,19 @@ public sealed partial class IDMsg : pb::IMessage private static readonly pb::MessageParser _parser = new pb::MessageParser(() => new IDMsg()); private pb::UnknownFieldSet _unknownFields; [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public static pb::MessageParser Parser { get { return _parser; } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public static pbr::MessageDescriptor Descriptor { get { return global::Protobuf.Message2ServerReflection.Descriptor.MessageTypes[1]; } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] pbr::MessageDescriptor pb::IMessage.Descriptor { get { return Descriptor; } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public IDMsg() { OnConstruction(); } @@ -249,7 +227,6 @@ public IDMsg() { partial void OnConstruction(); [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public IDMsg(IDMsg other) : this() { playerId_ = other.playerId_; teamId_ = other.teamId_; @@ -257,7 +234,6 @@ public IDMsg(IDMsg other) : this() { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public IDMsg Clone() { return new IDMsg(this); } @@ -266,7 +242,6 @@ public IDMsg Clone() { public const int PlayerIdFieldNumber = 1; private long playerId_; [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public long PlayerId { get { return playerId_; } set { @@ -278,7 +253,6 @@ public long PlayerId { public const int TeamIdFieldNumber = 2; private long teamId_; [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public long TeamId { get { return teamId_; } set { @@ -287,13 +261,11 @@ public long TeamId { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public override bool Equals(object other) { return Equals(other as IDMsg); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public bool Equals(IDMsg other) { if (ReferenceEquals(other, null)) { return false; @@ -307,7 +279,6 @@ public bool Equals(IDMsg other) { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public override int GetHashCode() { int hash = 1; if (PlayerId != 0L) hash ^= PlayerId.GetHashCode(); @@ -319,13 +290,11 @@ public override int GetHashCode() { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public override string ToString() { return pb::JsonFormatter.ToDiagnosticString(this); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public void WriteTo(pb::CodedOutputStream output) { #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE output.WriteRawMessage(this); @@ -346,7 +315,6 @@ public void WriteTo(pb::CodedOutputStream output) { #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) { if (PlayerId != 0L) { output.WriteRawTag(8); @@ -363,7 +331,6 @@ public void WriteTo(pb::CodedOutputStream output) { #endif [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public int CalculateSize() { int size = 0; if (PlayerId != 0L) { @@ -379,7 +346,6 @@ public int CalculateSize() { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public void MergeFrom(IDMsg other) { if (other == null) { return; @@ -394,7 +360,6 @@ public void MergeFrom(IDMsg other) { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public void MergeFrom(pb::CodedInputStream input) { #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE input.ReadRawMessage(this); @@ -420,7 +385,6 @@ public void MergeFrom(pb::CodedInputStream input) { #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) { uint tag; while ((tag = input.ReadTag()) != 0) { @@ -443,7 +407,6 @@ public void MergeFrom(pb::CodedInputStream input) { } - [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")] public sealed partial class PlayerMsg : pb::IMessage #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE , pb::IBufferMessage @@ -452,23 +415,19 @@ public sealed partial class PlayerMsg : pb::IMessage private static readonly pb::MessageParser _parser = new pb::MessageParser(() => new PlayerMsg()); private pb::UnknownFieldSet _unknownFields; [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public static pb::MessageParser Parser { get { return _parser; } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public static pbr::MessageDescriptor Descriptor { get { return global::Protobuf.Message2ServerReflection.Descriptor.MessageTypes[2]; } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] pbr::MessageDescriptor pb::IMessage.Descriptor { get { return Descriptor; } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public PlayerMsg() { OnConstruction(); } @@ -476,7 +435,6 @@ public PlayerMsg() { partial void OnConstruction(); [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public PlayerMsg(PlayerMsg other) : this() { playerId_ = other.playerId_; teamId_ = other.teamId_; @@ -485,7 +443,6 @@ public PlayerMsg(PlayerMsg other) : this() { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public PlayerMsg Clone() { return new PlayerMsg(this); } @@ -494,7 +451,6 @@ public PlayerMsg Clone() { public const int PlayerIdFieldNumber = 1; private long playerId_; [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public long PlayerId { get { return playerId_; } set { @@ -506,7 +462,6 @@ public long PlayerId { public const int TeamIdFieldNumber = 2; private long teamId_; [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public long TeamId { get { return teamId_; } set { @@ -518,7 +473,6 @@ public long TeamId { public const int ShipTypeFieldNumber = 3; private global::Protobuf.ShipType shipType_ = global::Protobuf.ShipType.NullShipType; [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public global::Protobuf.ShipType ShipType { get { return shipType_; } set { @@ -527,13 +481,11 @@ public long TeamId { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public override bool Equals(object other) { return Equals(other as PlayerMsg); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public bool Equals(PlayerMsg other) { if (ReferenceEquals(other, null)) { return false; @@ -548,7 +500,6 @@ public bool Equals(PlayerMsg other) { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public override int GetHashCode() { int hash = 1; if (PlayerId != 0L) hash ^= PlayerId.GetHashCode(); @@ -561,13 +512,11 @@ public override int GetHashCode() { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public override string ToString() { return pb::JsonFormatter.ToDiagnosticString(this); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public void WriteTo(pb::CodedOutputStream output) { #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE output.WriteRawMessage(this); @@ -592,7 +541,6 @@ public void WriteTo(pb::CodedOutputStream output) { #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) { if (PlayerId != 0L) { output.WriteRawTag(8); @@ -613,7 +561,6 @@ public void WriteTo(pb::CodedOutputStream output) { #endif [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public int CalculateSize() { int size = 0; if (PlayerId != 0L) { @@ -632,7 +579,6 @@ public int CalculateSize() { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public void MergeFrom(PlayerMsg other) { if (other == null) { return; @@ -650,7 +596,6 @@ public void MergeFrom(PlayerMsg other) { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public void MergeFrom(pb::CodedInputStream input) { #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE input.ReadRawMessage(this); @@ -680,7 +625,6 @@ public void MergeFrom(pb::CodedInputStream input) { #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) { uint tag; while ((tag = input.ReadTag()) != 0) { @@ -707,7 +651,6 @@ public void MergeFrom(pb::CodedInputStream input) { } - [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")] public sealed partial class MoveMsg : pb::IMessage #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE , pb::IBufferMessage @@ -716,23 +659,19 @@ public sealed partial class MoveMsg : pb::IMessage private static readonly pb::MessageParser _parser = new pb::MessageParser(() => new MoveMsg()); private pb::UnknownFieldSet _unknownFields; [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public static pb::MessageParser Parser { get { return _parser; } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public static pbr::MessageDescriptor Descriptor { get { return global::Protobuf.Message2ServerReflection.Descriptor.MessageTypes[3]; } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] pbr::MessageDescriptor pb::IMessage.Descriptor { get { return Descriptor; } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public MoveMsg() { OnConstruction(); } @@ -740,7 +679,6 @@ public MoveMsg() { partial void OnConstruction(); [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public MoveMsg(MoveMsg other) : this() { playerId_ = other.playerId_; angle_ = other.angle_; @@ -750,7 +688,6 @@ public MoveMsg(MoveMsg other) : this() { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public MoveMsg Clone() { return new MoveMsg(this); } @@ -759,7 +696,6 @@ public MoveMsg Clone() { public const int PlayerIdFieldNumber = 1; private long playerId_; [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public long PlayerId { get { return playerId_; } set { @@ -771,7 +707,6 @@ public long PlayerId { public const int AngleFieldNumber = 2; private double angle_; [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public double Angle { get { return angle_; } set { @@ -783,7 +718,6 @@ public double Angle { public const int TimeInMillisecondsFieldNumber = 3; private long timeInMilliseconds_; [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public long TimeInMilliseconds { get { return timeInMilliseconds_; } set { @@ -795,7 +729,6 @@ public long TimeInMilliseconds { public const int TeamIdFieldNumber = 4; private long teamId_; [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public long TeamId { get { return teamId_; } set { @@ -804,13 +737,11 @@ public long TeamId { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public override bool Equals(object other) { return Equals(other as MoveMsg); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public bool Equals(MoveMsg other) { if (ReferenceEquals(other, null)) { return false; @@ -826,7 +757,6 @@ public bool Equals(MoveMsg other) { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public override int GetHashCode() { int hash = 1; if (PlayerId != 0L) hash ^= PlayerId.GetHashCode(); @@ -840,13 +770,11 @@ public override int GetHashCode() { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public override string ToString() { return pb::JsonFormatter.ToDiagnosticString(this); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public void WriteTo(pb::CodedOutputStream output) { #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE output.WriteRawMessage(this); @@ -875,7 +803,6 @@ public void WriteTo(pb::CodedOutputStream output) { #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) { if (PlayerId != 0L) { output.WriteRawTag(8); @@ -900,7 +827,6 @@ public void WriteTo(pb::CodedOutputStream output) { #endif [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public int CalculateSize() { int size = 0; if (PlayerId != 0L) { @@ -922,7 +848,6 @@ public int CalculateSize() { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public void MergeFrom(MoveMsg other) { if (other == null) { return; @@ -943,7 +868,6 @@ public void MergeFrom(MoveMsg other) { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public void MergeFrom(pb::CodedInputStream input) { #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE input.ReadRawMessage(this); @@ -977,7 +901,6 @@ public void MergeFrom(pb::CodedInputStream input) { #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) { uint tag; while ((tag = input.ReadTag()) != 0) { @@ -1008,7 +931,6 @@ public void MergeFrom(pb::CodedInputStream input) { } - [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")] public sealed partial class SendMsg : pb::IMessage #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE , pb::IBufferMessage @@ -1017,23 +939,19 @@ public sealed partial class SendMsg : pb::IMessage private static readonly pb::MessageParser _parser = new pb::MessageParser(() => new SendMsg()); private pb::UnknownFieldSet _unknownFields; [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public static pb::MessageParser Parser { get { return _parser; } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public static pbr::MessageDescriptor Descriptor { get { return global::Protobuf.Message2ServerReflection.Descriptor.MessageTypes[4]; } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] pbr::MessageDescriptor pb::IMessage.Descriptor { get { return Descriptor; } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public SendMsg() { OnConstruction(); } @@ -1041,7 +959,6 @@ public SendMsg() { partial void OnConstruction(); [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public SendMsg(SendMsg other) : this() { playerId_ = other.playerId_; toPlayerId_ = other.toPlayerId_; @@ -1059,7 +976,6 @@ public SendMsg(SendMsg other) : this() { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public SendMsg Clone() { return new SendMsg(this); } @@ -1068,7 +984,6 @@ public SendMsg Clone() { public const int PlayerIdFieldNumber = 1; private long playerId_; [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public long PlayerId { get { return playerId_; } set { @@ -1080,7 +995,6 @@ public long PlayerId { public const int ToPlayerIdFieldNumber = 2; private long toPlayerId_; [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public long ToPlayerId { get { return toPlayerId_; } set { @@ -1091,60 +1005,29 @@ public long ToPlayerId { /// Field number for the "text_message" field. public const int TextMessageFieldNumber = 3; [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public string TextMessage { - get { return HasTextMessage ? (string) message_ : ""; } + get { return messageCase_ == MessageOneofCase.TextMessage ? (string) message_ : ""; } set { message_ = pb::ProtoPreconditions.CheckNotNull(value, "value"); messageCase_ = MessageOneofCase.TextMessage; } } - /// Gets whether the "text_message" field is set - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] - public bool HasTextMessage { - get { return messageCase_ == MessageOneofCase.TextMessage; } - } - /// Clears the value of the oneof if it's currently set to "text_message" - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] - public void ClearTextMessage() { - if (HasTextMessage) { - ClearMessage(); - } - } /// Field number for the "binary_message" field. public const int BinaryMessageFieldNumber = 4; [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public pb::ByteString BinaryMessage { - get { return HasBinaryMessage ? (pb::ByteString) message_ : pb::ByteString.Empty; } + get { return messageCase_ == MessageOneofCase.BinaryMessage ? (pb::ByteString) message_ : pb::ByteString.Empty; } set { message_ = pb::ProtoPreconditions.CheckNotNull(value, "value"); messageCase_ = MessageOneofCase.BinaryMessage; } } - /// Gets whether the "binary_message" field is set - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] - public bool HasBinaryMessage { - get { return messageCase_ == MessageOneofCase.BinaryMessage; } - } - /// Clears the value of the oneof if it's currently set to "binary_message" - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] - public void ClearBinaryMessage() { - if (HasBinaryMessage) { - ClearMessage(); - } - } /// Field number for the "team_id" field. public const int TeamIdFieldNumber = 5; private long teamId_; [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public long TeamId { get { return teamId_; } set { @@ -1161,26 +1044,22 @@ public enum MessageOneofCase { } private MessageOneofCase messageCase_ = MessageOneofCase.None; [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public MessageOneofCase MessageCase { get { return messageCase_; } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public void ClearMessage() { messageCase_ = MessageOneofCase.None; message_ = null; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public override bool Equals(object other) { return Equals(other as SendMsg); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public bool Equals(SendMsg other) { if (ReferenceEquals(other, null)) { return false; @@ -1198,13 +1077,12 @@ public bool Equals(SendMsg other) { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public override int GetHashCode() { int hash = 1; if (PlayerId != 0L) hash ^= PlayerId.GetHashCode(); if (ToPlayerId != 0L) hash ^= ToPlayerId.GetHashCode(); - if (HasTextMessage) hash ^= TextMessage.GetHashCode(); - if (HasBinaryMessage) hash ^= BinaryMessage.GetHashCode(); + if (messageCase_ == MessageOneofCase.TextMessage) hash ^= TextMessage.GetHashCode(); + if (messageCase_ == MessageOneofCase.BinaryMessage) hash ^= BinaryMessage.GetHashCode(); if (TeamId != 0L) hash ^= TeamId.GetHashCode(); hash ^= (int) messageCase_; if (_unknownFields != null) { @@ -1214,13 +1092,11 @@ public override int GetHashCode() { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public override string ToString() { return pb::JsonFormatter.ToDiagnosticString(this); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public void WriteTo(pb::CodedOutputStream output) { #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE output.WriteRawMessage(this); @@ -1233,11 +1109,11 @@ public void WriteTo(pb::CodedOutputStream output) { output.WriteRawTag(16); output.WriteInt64(ToPlayerId); } - if (HasTextMessage) { + if (messageCase_ == MessageOneofCase.TextMessage) { output.WriteRawTag(26); output.WriteString(TextMessage); } - if (HasBinaryMessage) { + if (messageCase_ == MessageOneofCase.BinaryMessage) { output.WriteRawTag(34); output.WriteBytes(BinaryMessage); } @@ -1253,7 +1129,6 @@ public void WriteTo(pb::CodedOutputStream output) { #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) { if (PlayerId != 0L) { output.WriteRawTag(8); @@ -1263,11 +1138,11 @@ public void WriteTo(pb::CodedOutputStream output) { output.WriteRawTag(16); output.WriteInt64(ToPlayerId); } - if (HasTextMessage) { + if (messageCase_ == MessageOneofCase.TextMessage) { output.WriteRawTag(26); output.WriteString(TextMessage); } - if (HasBinaryMessage) { + if (messageCase_ == MessageOneofCase.BinaryMessage) { output.WriteRawTag(34); output.WriteBytes(BinaryMessage); } @@ -1282,7 +1157,6 @@ public void WriteTo(pb::CodedOutputStream output) { #endif [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public int CalculateSize() { int size = 0; if (PlayerId != 0L) { @@ -1291,10 +1165,10 @@ public int CalculateSize() { if (ToPlayerId != 0L) { size += 1 + pb::CodedOutputStream.ComputeInt64Size(ToPlayerId); } - if (HasTextMessage) { + if (messageCase_ == MessageOneofCase.TextMessage) { size += 1 + pb::CodedOutputStream.ComputeStringSize(TextMessage); } - if (HasBinaryMessage) { + if (messageCase_ == MessageOneofCase.BinaryMessage) { size += 1 + pb::CodedOutputStream.ComputeBytesSize(BinaryMessage); } if (TeamId != 0L) { @@ -1307,7 +1181,6 @@ public int CalculateSize() { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public void MergeFrom(SendMsg other) { if (other == null) { return; @@ -1334,7 +1207,6 @@ public void MergeFrom(SendMsg other) { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public void MergeFrom(pb::CodedInputStream input) { #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE input.ReadRawMessage(this); @@ -1372,7 +1244,6 @@ public void MergeFrom(pb::CodedInputStream input) { #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) { uint tag; while ((tag = input.ReadTag()) != 0) { @@ -1407,7 +1278,6 @@ public void MergeFrom(pb::CodedInputStream input) { } - [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")] public sealed partial class AttackMsg : pb::IMessage #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE , pb::IBufferMessage @@ -1416,23 +1286,19 @@ public sealed partial class AttackMsg : pb::IMessage private static readonly pb::MessageParser _parser = new pb::MessageParser(() => new AttackMsg()); private pb::UnknownFieldSet _unknownFields; [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public static pb::MessageParser Parser { get { return _parser; } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public static pbr::MessageDescriptor Descriptor { get { return global::Protobuf.Message2ServerReflection.Descriptor.MessageTypes[5]; } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] pbr::MessageDescriptor pb::IMessage.Descriptor { get { return Descriptor; } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public AttackMsg() { OnConstruction(); } @@ -1440,7 +1306,6 @@ public AttackMsg() { partial void OnConstruction(); [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public AttackMsg(AttackMsg other) : this() { playerId_ = other.playerId_; angle_ = other.angle_; @@ -1449,7 +1314,6 @@ public AttackMsg(AttackMsg other) : this() { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public AttackMsg Clone() { return new AttackMsg(this); } @@ -1458,7 +1322,6 @@ public AttackMsg Clone() { public const int PlayerIdFieldNumber = 1; private long playerId_; [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public long PlayerId { get { return playerId_; } set { @@ -1470,7 +1333,6 @@ public long PlayerId { public const int AngleFieldNumber = 2; private double angle_; [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public double Angle { get { return angle_; } set { @@ -1482,7 +1344,6 @@ public double Angle { public const int TeamIdFieldNumber = 3; private long teamId_; [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public long TeamId { get { return teamId_; } set { @@ -1491,13 +1352,11 @@ public long TeamId { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public override bool Equals(object other) { return Equals(other as AttackMsg); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public bool Equals(AttackMsg other) { if (ReferenceEquals(other, null)) { return false; @@ -1512,7 +1371,6 @@ public bool Equals(AttackMsg other) { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public override int GetHashCode() { int hash = 1; if (PlayerId != 0L) hash ^= PlayerId.GetHashCode(); @@ -1525,13 +1383,11 @@ public override int GetHashCode() { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public override string ToString() { return pb::JsonFormatter.ToDiagnosticString(this); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public void WriteTo(pb::CodedOutputStream output) { #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE output.WriteRawMessage(this); @@ -1556,7 +1412,6 @@ public void WriteTo(pb::CodedOutputStream output) { #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) { if (PlayerId != 0L) { output.WriteRawTag(8); @@ -1577,7 +1432,6 @@ public void WriteTo(pb::CodedOutputStream output) { #endif [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public int CalculateSize() { int size = 0; if (PlayerId != 0L) { @@ -1596,7 +1450,6 @@ public int CalculateSize() { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public void MergeFrom(AttackMsg other) { if (other == null) { return; @@ -1614,7 +1467,6 @@ public void MergeFrom(AttackMsg other) { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public void MergeFrom(pb::CodedInputStream input) { #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE input.ReadRawMessage(this); @@ -1644,7 +1496,6 @@ public void MergeFrom(pb::CodedInputStream input) { #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) { uint tag; while ((tag = input.ReadTag()) != 0) { @@ -1671,7 +1522,6 @@ public void MergeFrom(pb::CodedInputStream input) { } - [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")] public sealed partial class ConstructMsg : pb::IMessage #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE , pb::IBufferMessage @@ -1680,23 +1530,19 @@ public sealed partial class ConstructMsg : pb::IMessage private static readonly pb::MessageParser _parser = new pb::MessageParser(() => new ConstructMsg()); private pb::UnknownFieldSet _unknownFields; [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public static pb::MessageParser Parser { get { return _parser; } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public static pbr::MessageDescriptor Descriptor { get { return global::Protobuf.Message2ServerReflection.Descriptor.MessageTypes[6]; } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] pbr::MessageDescriptor pb::IMessage.Descriptor { get { return Descriptor; } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public ConstructMsg() { OnConstruction(); } @@ -1704,7 +1550,6 @@ public ConstructMsg() { partial void OnConstruction(); [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public ConstructMsg(ConstructMsg other) : this() { playerId_ = other.playerId_; constructionType_ = other.constructionType_; @@ -1713,7 +1558,6 @@ public ConstructMsg(ConstructMsg other) : this() { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public ConstructMsg Clone() { return new ConstructMsg(this); } @@ -1722,7 +1566,6 @@ public ConstructMsg Clone() { public const int PlayerIdFieldNumber = 1; private long playerId_; [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public long PlayerId { get { return playerId_; } set { @@ -1734,7 +1577,6 @@ public long PlayerId { public const int ConstructionTypeFieldNumber = 2; private global::Protobuf.ConstructionType constructionType_ = global::Protobuf.ConstructionType.NullConstructionType; [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public global::Protobuf.ConstructionType ConstructionType { get { return constructionType_; } set { @@ -1746,7 +1588,6 @@ public long PlayerId { public const int TeamIdFieldNumber = 3; private long teamId_; [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public long TeamId { get { return teamId_; } set { @@ -1755,13 +1596,11 @@ public long TeamId { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public override bool Equals(object other) { return Equals(other as ConstructMsg); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public bool Equals(ConstructMsg other) { if (ReferenceEquals(other, null)) { return false; @@ -1776,7 +1615,6 @@ public bool Equals(ConstructMsg other) { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public override int GetHashCode() { int hash = 1; if (PlayerId != 0L) hash ^= PlayerId.GetHashCode(); @@ -1789,13 +1627,11 @@ public override int GetHashCode() { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public override string ToString() { return pb::JsonFormatter.ToDiagnosticString(this); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public void WriteTo(pb::CodedOutputStream output) { #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE output.WriteRawMessage(this); @@ -1820,7 +1656,6 @@ public void WriteTo(pb::CodedOutputStream output) { #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) { if (PlayerId != 0L) { output.WriteRawTag(8); @@ -1841,7 +1676,6 @@ public void WriteTo(pb::CodedOutputStream output) { #endif [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public int CalculateSize() { int size = 0; if (PlayerId != 0L) { @@ -1860,7 +1694,6 @@ public int CalculateSize() { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public void MergeFrom(ConstructMsg other) { if (other == null) { return; @@ -1878,7 +1711,6 @@ public void MergeFrom(ConstructMsg other) { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public void MergeFrom(pb::CodedInputStream input) { #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE input.ReadRawMessage(this); @@ -1908,7 +1740,6 @@ public void MergeFrom(pb::CodedInputStream input) { #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) { uint tag; while ((tag = input.ReadTag()) != 0) { @@ -1935,7 +1766,6 @@ public void MergeFrom(pb::CodedInputStream input) { } - [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")] public sealed partial class RecoverMsg : pb::IMessage #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE , pb::IBufferMessage @@ -1944,23 +1774,19 @@ public sealed partial class RecoverMsg : pb::IMessage private static readonly pb::MessageParser _parser = new pb::MessageParser(() => new RecoverMsg()); private pb::UnknownFieldSet _unknownFields; [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public static pb::MessageParser Parser { get { return _parser; } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public static pbr::MessageDescriptor Descriptor { get { return global::Protobuf.Message2ServerReflection.Descriptor.MessageTypes[7]; } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] pbr::MessageDescriptor pb::IMessage.Descriptor { get { return Descriptor; } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public RecoverMsg() { OnConstruction(); } @@ -1968,7 +1794,6 @@ public RecoverMsg() { partial void OnConstruction(); [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public RecoverMsg(RecoverMsg other) : this() { playerId_ = other.playerId_; recover_ = other.recover_; @@ -1977,7 +1802,6 @@ public RecoverMsg(RecoverMsg other) : this() { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public RecoverMsg Clone() { return new RecoverMsg(this); } @@ -1986,7 +1810,6 @@ public RecoverMsg Clone() { public const int PlayerIdFieldNumber = 1; private long playerId_; [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public long PlayerId { get { return playerId_; } set { @@ -1998,7 +1821,6 @@ public long PlayerId { public const int RecoverFieldNumber = 2; private long recover_; [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public long Recover { get { return recover_; } set { @@ -2010,7 +1832,6 @@ public long Recover { public const int TeamIdFieldNumber = 3; private long teamId_; [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public long TeamId { get { return teamId_; } set { @@ -2019,13 +1840,11 @@ public long TeamId { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public override bool Equals(object other) { return Equals(other as RecoverMsg); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public bool Equals(RecoverMsg other) { if (ReferenceEquals(other, null)) { return false; @@ -2040,7 +1859,6 @@ public bool Equals(RecoverMsg other) { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public override int GetHashCode() { int hash = 1; if (PlayerId != 0L) hash ^= PlayerId.GetHashCode(); @@ -2053,13 +1871,11 @@ public override int GetHashCode() { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public override string ToString() { return pb::JsonFormatter.ToDiagnosticString(this); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public void WriteTo(pb::CodedOutputStream output) { #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE output.WriteRawMessage(this); @@ -2084,7 +1900,6 @@ public void WriteTo(pb::CodedOutputStream output) { #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) { if (PlayerId != 0L) { output.WriteRawTag(8); @@ -2105,7 +1920,6 @@ public void WriteTo(pb::CodedOutputStream output) { #endif [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public int CalculateSize() { int size = 0; if (PlayerId != 0L) { @@ -2124,7 +1938,6 @@ public int CalculateSize() { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public void MergeFrom(RecoverMsg other) { if (other == null) { return; @@ -2142,7 +1955,6 @@ public void MergeFrom(RecoverMsg other) { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public void MergeFrom(pb::CodedInputStream input) { #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE input.ReadRawMessage(this); @@ -2172,7 +1984,6 @@ public void MergeFrom(pb::CodedInputStream input) { #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) { uint tag; while ((tag = input.ReadTag()) != 0) { @@ -2199,7 +2010,6 @@ public void MergeFrom(pb::CodedInputStream input) { } - [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")] public sealed partial class InstallMsg : pb::IMessage #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE , pb::IBufferMessage @@ -2208,23 +2018,19 @@ public sealed partial class InstallMsg : pb::IMessage private static readonly pb::MessageParser _parser = new pb::MessageParser(() => new InstallMsg()); private pb::UnknownFieldSet _unknownFields; [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public static pb::MessageParser Parser { get { return _parser; } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public static pbr::MessageDescriptor Descriptor { get { return global::Protobuf.Message2ServerReflection.Descriptor.MessageTypes[8]; } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] pbr::MessageDescriptor pb::IMessage.Descriptor { get { return Descriptor; } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public InstallMsg() { OnConstruction(); } @@ -2232,7 +2038,6 @@ public InstallMsg() { partial void OnConstruction(); [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public InstallMsg(InstallMsg other) : this() { moduleType_ = other.moduleType_; playerId_ = other.playerId_; @@ -2241,7 +2046,6 @@ public InstallMsg(InstallMsg other) : this() { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public InstallMsg Clone() { return new InstallMsg(this); } @@ -2250,7 +2054,6 @@ public InstallMsg Clone() { public const int ModuleTypeFieldNumber = 1; private global::Protobuf.ModuleType moduleType_ = global::Protobuf.ModuleType.NullModuleType; [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public global::Protobuf.ModuleType ModuleType { get { return moduleType_; } set { @@ -2262,7 +2065,6 @@ public InstallMsg Clone() { public const int PlayerIdFieldNumber = 2; private long playerId_; [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public long PlayerId { get { return playerId_; } set { @@ -2274,7 +2076,6 @@ public long PlayerId { public const int TeamIdFieldNumber = 3; private long teamId_; [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public long TeamId { get { return teamId_; } set { @@ -2283,13 +2084,11 @@ public long TeamId { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public override bool Equals(object other) { return Equals(other as InstallMsg); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public bool Equals(InstallMsg other) { if (ReferenceEquals(other, null)) { return false; @@ -2304,7 +2103,6 @@ public bool Equals(InstallMsg other) { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public override int GetHashCode() { int hash = 1; if (ModuleType != global::Protobuf.ModuleType.NullModuleType) hash ^= ModuleType.GetHashCode(); @@ -2317,13 +2115,11 @@ public override int GetHashCode() { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public override string ToString() { return pb::JsonFormatter.ToDiagnosticString(this); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public void WriteTo(pb::CodedOutputStream output) { #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE output.WriteRawMessage(this); @@ -2348,7 +2144,6 @@ public void WriteTo(pb::CodedOutputStream output) { #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) { if (ModuleType != global::Protobuf.ModuleType.NullModuleType) { output.WriteRawTag(8); @@ -2369,7 +2164,6 @@ public void WriteTo(pb::CodedOutputStream output) { #endif [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public int CalculateSize() { int size = 0; if (ModuleType != global::Protobuf.ModuleType.NullModuleType) { @@ -2388,7 +2182,6 @@ public int CalculateSize() { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public void MergeFrom(InstallMsg other) { if (other == null) { return; @@ -2406,7 +2199,6 @@ public void MergeFrom(InstallMsg other) { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public void MergeFrom(pb::CodedInputStream input) { #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE input.ReadRawMessage(this); @@ -2436,7 +2228,6 @@ public void MergeFrom(pb::CodedInputStream input) { #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) { uint tag; while ((tag = input.ReadTag()) != 0) { @@ -2463,7 +2254,6 @@ public void MergeFrom(pb::CodedInputStream input) { } - [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")] public sealed partial class BuildShipMsg : pb::IMessage #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE , pb::IBufferMessage @@ -2472,23 +2262,19 @@ public sealed partial class BuildShipMsg : pb::IMessage private static readonly pb::MessageParser _parser = new pb::MessageParser(() => new BuildShipMsg()); private pb::UnknownFieldSet _unknownFields; [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public static pb::MessageParser Parser { get { return _parser; } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public static pbr::MessageDescriptor Descriptor { get { return global::Protobuf.Message2ServerReflection.Descriptor.MessageTypes[9]; } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] pbr::MessageDescriptor pb::IMessage.Descriptor { get { return Descriptor; } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public BuildShipMsg() { OnConstruction(); } @@ -2496,7 +2282,6 @@ public BuildShipMsg() { partial void OnConstruction(); [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public BuildShipMsg(BuildShipMsg other) : this() { shipType_ = other.shipType_; teamId_ = other.teamId_; @@ -2505,7 +2290,6 @@ public BuildShipMsg(BuildShipMsg other) : this() { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public BuildShipMsg Clone() { return new BuildShipMsg(this); } @@ -2514,7 +2298,6 @@ public BuildShipMsg Clone() { public const int ShipTypeFieldNumber = 1; private global::Protobuf.ShipType shipType_ = global::Protobuf.ShipType.NullShipType; [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public global::Protobuf.ShipType ShipType { get { return shipType_; } set { @@ -2526,7 +2309,6 @@ public BuildShipMsg Clone() { public const int TeamIdFieldNumber = 2; private long teamId_; [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public long TeamId { get { return teamId_; } set { @@ -2538,7 +2320,6 @@ public long TeamId { public const int BirthpointIndexFieldNumber = 3; private int birthpointIndex_; [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public int BirthpointIndex { get { return birthpointIndex_; } set { @@ -2547,13 +2328,11 @@ public int BirthpointIndex { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public override bool Equals(object other) { return Equals(other as BuildShipMsg); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public bool Equals(BuildShipMsg other) { if (ReferenceEquals(other, null)) { return false; @@ -2568,7 +2347,6 @@ public bool Equals(BuildShipMsg other) { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public override int GetHashCode() { int hash = 1; if (ShipType != global::Protobuf.ShipType.NullShipType) hash ^= ShipType.GetHashCode(); @@ -2581,13 +2359,11 @@ public override int GetHashCode() { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public override string ToString() { return pb::JsonFormatter.ToDiagnosticString(this); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public void WriteTo(pb::CodedOutputStream output) { #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE output.WriteRawMessage(this); @@ -2612,7 +2388,6 @@ public void WriteTo(pb::CodedOutputStream output) { #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) { if (ShipType != global::Protobuf.ShipType.NullShipType) { output.WriteRawTag(8); @@ -2633,7 +2408,6 @@ public void WriteTo(pb::CodedOutputStream output) { #endif [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public int CalculateSize() { int size = 0; if (ShipType != global::Protobuf.ShipType.NullShipType) { @@ -2652,7 +2426,6 @@ public int CalculateSize() { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public void MergeFrom(BuildShipMsg other) { if (other == null) { return; @@ -2670,7 +2443,6 @@ public void MergeFrom(BuildShipMsg other) { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public void MergeFrom(pb::CodedInputStream input) { #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE input.ReadRawMessage(this); @@ -2700,7 +2472,6 @@ public void MergeFrom(pb::CodedInputStream input) { #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) { uint tag; while ((tag = input.ReadTag()) != 0) { diff --git a/interface/interface_live/Assets/Scripts/Define/Message2ServerGrpc.cs b/interface/interface_live/Assets/Scripts/Define/Message2ServerGrpc.cs new file mode 100644 index 00000000..e69de29b diff --git a/interface/interface_live/Assets/Scripts/Define/Message2ServerGrpc.cs.meta b/interface/interface_live/Assets/Scripts/Define/Message2ServerGrpc.cs.meta new file mode 100644 index 00000000..e98f7dbb --- /dev/null +++ b/interface/interface_live/Assets/Scripts/Define/Message2ServerGrpc.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 18057fd68de6faf48b458871213331f9 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/interface/interface_live/Assets/Scripts/Define/MessageType.cs b/interface/interface_live/Assets/Scripts/Define/MessageType.cs index cb628491..c27e6cd6 100644 --- a/interface/interface_live/Assets/Scripts/Define/MessageType.cs +++ b/interface/interface_live/Assets/Scripts/Define/MessageType.cs @@ -2,7 +2,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: MessageType.proto // -#pragma warning disable 1591, 0612, 3021, 8981 +#pragma warning disable 1591, 0612, 3021 #region Designer generated code using pb = global::Google.Protobuf; diff --git a/interface/interface_live/Assets/Scripts/Define/MessageTypeGrpc.cs b/interface/interface_live/Assets/Scripts/Define/MessageTypeGrpc.cs new file mode 100644 index 00000000..e69de29b diff --git a/interface/interface_live/Assets/Scripts/Define/MessageTypeGrpc.cs.meta b/interface/interface_live/Assets/Scripts/Define/MessageTypeGrpc.cs.meta new file mode 100644 index 00000000..55af9b77 --- /dev/null +++ b/interface/interface_live/Assets/Scripts/Define/MessageTypeGrpc.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 3add269153c4f484bbde1a8d90b9d5d7 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/interface/interface_live/Assets/Scripts/Define/Parameter/CoreParam.cs b/interface/interface_live/Assets/Scripts/Define/Parameter/CoreParam.cs index 80775e2b..fddd0bb9 100644 --- a/interface/interface_live/Assets/Scripts/Define/Parameter/CoreParam.cs +++ b/interface/interface_live/Assets/Scripts/Define/Parameter/CoreParam.cs @@ -6,40 +6,69 @@ public class CoreParam { + // public class FrameQueue + // { + // public FrameQueue(int _maxSize = 20) + // { + // maxSize = _maxSize; + // tail = maxSize - 1; + // valQueue = new T[maxSize]; + // } + // public readonly int maxSize; + // private T[] valQueue; + // private int tail; + // public void Add(T val) + // { + // tail = (tail + 1) % maxSize; + // valQueue[tail] = val; + // } + // public T GetValue(int index) + // { + // if (index >= maxSize) + // return default; + // return valQueue[(tail + maxSize - index) % maxSize]; + // } + // }; public class FrameQueue { - public FrameQueue(int _maxSize = 10) + public FrameQueue() { - maxSize = _maxSize; - tail = maxSize - 1; - valQueue = new T[maxSize]; + valQueue = new Queue(); } - public readonly int maxSize; - private T[] valQueue; - private int tail; + private Queue valQueue; public void Add(T val) { - tail = (tail + 1) % maxSize; - valQueue[tail] = val; + valQueue.Enqueue(val); } - public T GetValue(int index) + public T GetValue() { - if (index >= maxSize) + if (valQueue.Count == 0) return default; - return valQueue[(tail + maxSize - index) % maxSize]; + return valQueue.Dequeue(); + } + public int GetSize() + { + return valQueue.Count; } }; + // public static FrameQueue stringQueue = new FrameQueue(); public static FrameQueue frameQueue = new FrameQueue(); + public static MessageToClient firstFrame, currentFrame; public static MessageOfMap map; - public static Dictionary, MessageOfResource> resources; + public static Dictionary, MessageOfResource> resources = new Dictionary, MessageOfResource>(); public static MessageOfHome[] homes = new MessageOfHome[2]; public static MessageOfTeam[] teams = new MessageOfTeam[2]; - public static MessageOfShip[] ships = new MessageOfShip[8]; - public static GameObject[] shipsG = new GameObject[8]; - public static Dictionary bullets; - public static Dictionary bombedBullets; - public static List factories; - public static List communities; - public static List forts; + public static Dictionary ships = new Dictionary(); + public static Dictionary shipsG = new Dictionary(); + public static Dictionary bullets = new Dictionary(); + public static Dictionary bulletsG = new Dictionary(); + public static Dictionary, MessageOfFactory> factories = new Dictionary, MessageOfFactory>(); + public static Dictionary, GameObject> factoriesG = new Dictionary, GameObject>(); + public static Dictionary, MessageOfCommunity> communities = new Dictionary, MessageOfCommunity>(); + public static Dictionary, GameObject> communitiesG = new Dictionary, GameObject>(); + public static Dictionary, MessageOfFort> forts = new Dictionary, MessageOfFort>(); + public static Dictionary, GameObject> fortsG = new Dictionary, GameObject>(); + public static Dictionary, MessageOfWormhole> wormholes = new Dictionary, MessageOfWormhole>(); public static bool initialized; + public static int cnt = 0; } diff --git a/interface/interface_live/Assets/Scripts/Message/UpdateManager.cs b/interface/interface_live/Assets/Scripts/Message/UpdateManager.cs index e8c18d25..b0e6dec1 100644 --- a/interface/interface_live/Assets/Scripts/Message/UpdateManager.cs +++ b/interface/interface_live/Assets/Scripts/Message/UpdateManager.cs @@ -8,13 +8,18 @@ public class UpdateManager : SingletonMono, IUpdateManager { JsonSerializerSettings jSetting = new JsonSerializerSettings { - NullValueHandling = NullValueHandling.Ignore + + NullValueHandling = NullValueHandling.Ignore, + ContractResolver = new Newtonsoft.Json.Serialization.CamelCasePropertyNamesContractResolver() }; public void UpdateMessageByJson(string jsonInfo) { - // Debugger.GetInstance().text.text = jsonInfo; - CoreParam.frameQueue.Add(JsonConvert.DeserializeObject(jsonInfo, jSetting)); - Debug.Log(CoreParam.frameQueue.GetValue(0)); + jsonInfo = jsonInfo.Replace("List\"", "\""); + if (jsonInfo.Contains("mapMessage")) + CoreParam.firstFrame = JsonConvert.DeserializeObject(jsonInfo, jSetting); + else + CoreParam.frameQueue.Add(JsonConvert.DeserializeObject(jsonInfo, jSetting)); + CoreParam.cnt++; } // Start is called before the first frame update void Start() diff --git a/interface/interface_live/Assets/Scripts/ParaDefine.cs b/interface/interface_live/Assets/Scripts/ParaDefine.cs new file mode 100644 index 00000000..ef76ab73 --- /dev/null +++ b/interface/interface_live/Assets/Scripts/ParaDefine.cs @@ -0,0 +1,38 @@ +using System; +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class ParaDefine : SingletonMono +{ + // public BulletData laserData, plasmaData, shellData, missileData, arcData, fortBulletData; + // public ProducerData producer1Data, producer2Data, producer3Data; + // public ConstructorData constructor1Data, constructor2Data, constructor3Data; + // public ShipData civilShipData, militaryShipData, flagShipData; + // public ConstructionData factoryData, communityData, fortData; + // public ArmorData armor1Data, armor2Data, armor3Data; + // public ShieldData shield1Data, shield2Data, shield3Data; + // public BaseData baseData; + [Serializable] + public class litColorSetting + { + public litColorSetting(Color _color, float _idensity) + { + this.color = _color; + this.idensity = _idensity; + } + public Color color; + public float idensity; + } + public litColorSetting[] Team0Color, Team1Color; + public litColorSetting[] ResourceColor; + public litColorSetting[] LaserColor, PlasmaColor; +} + +[Serializable] +public struct ShipDic +{ + public int civilShipNum; + public int militaryShipNum; + public int flagShipNum; +} \ No newline at end of file diff --git a/interface/interface_live/Assets/Scripts/ParaDefine.cs.meta b/interface/interface_live/Assets/Scripts/ParaDefine.cs.meta new file mode 100644 index 00000000..1e6155e1 --- /dev/null +++ b/interface/interface_live/Assets/Scripts/ParaDefine.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 1a3f2ac20373c1f49b6e8fa147801c69 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/interface/interface_live/Assets/Scripts/PlayerControl.cs b/interface/interface_live/Assets/Scripts/PlayerControl.cs new file mode 100644 index 00000000..0d468ae4 --- /dev/null +++ b/interface/interface_live/Assets/Scripts/PlayerControl.cs @@ -0,0 +1,175 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using UnityEngine.EventSystems; + +public class PlayerControl : SingletonMono +{ + public LayerMask interactableLayer; + Collider2D raycaster; + // public List tobeSelectedInt, selectedInt; + public bool selectingAll; + // public List enabledInteract; + // public InteractControl.InteractOption selectedOption; + public float longClickTime, longClickTimer; + public Vector2 clickPnt, cameraPos; + void Start() + { + + } + + // Update is called once per frame + void Update() + { + // testInput(); + // if (Input.GetKeyDown(KeyCode.E)) + // { + // foreach (InteractBase i in selectedInt) + // { + // i.selected = false; + // } + // selectedInt.Clear(); + // } + if (Input.GetMouseButtonDown(0)) + { + longClickTimer = longClickTime; + cameraPos = Camera.main.transform.position; + clickPnt = Input.mousePosition; + } + longClickTimer -= Time.deltaTime; + if (longClickTimer < 0) + longClickTimer = 0; + CheckInteract(); + // UpdateInteractList(); + // Interact(); + // ShipAttack(); + } + // void testInput() + // { + // if (Input.GetKeyDown(KeyCode.P)) + // selectedOption = InteractControl.InteractOption.Produce; + // if (Input.GetKeyDown(KeyCode.C)) + // selectedOption = InteractControl.InteractOption.ConstructFactory; + // } + void CheckInteract() + { + // for (int i = 0; i < selectedInt.Count; i++) + // if (!selectedInt[i]) + // { + // selectedInt.Remove(selectedInt[i]); + // } + raycaster = Physics2D.OverlapPoint(Camera.main.ScreenToWorldPoint(Input.mousePosition), interactableLayer); + if (raycaster) + { + // Debug.Log("raycasthit"); + if (!selectingAll) + { + // raycaster.GetComponent().tobeSelected = true; + // if (!tobeSelectedInt.Contains(raycaster.GetComponent())) + // { + // tobeSelectedInt.Add(raycaster.GetComponent()); + // } + // if (Input.GetMouseButtonDown(0)) + // { + // if (!Input.GetKey(KeyCode.LeftShift)) + // { + + // foreach (InteractBase i in selectedInt) + // { + // i.selected = false; + // } + // selectedInt.Clear(); + // } + // raycaster.GetComponent().tobeSelected = false; + // tobeSelectedInt.Remove(raycaster.GetComponent()); + // raycaster.GetComponent().selected = true; + // if (!selectedInt.Contains(raycaster.GetComponent())) + // { + // selectedInt.Add(raycaster.GetComponent()); + // } + // } + // if (Input.GetMouseButtonDown(1)) + // { + // ShipMove(raycaster.transform.position); + // } + } + } + else + { + if (!selectingAll) + { + // foreach (InteractBase i in tobeSelectedInt) + // { + // i.tobeSelected = false; + // } + // tobeSelectedInt.Clear(); + // Debug.Log("clear" + tobeSelectedInt.Count); + if (!EventSystem.current.IsPointerOverGameObject()) + { + // if (Input.GetMouseButtonUp(0) && longClickTimer > 0) + // { + // ShipAttack(); + // } + if (Input.GetMouseButton(0)) + { + Camera.main.transform.position = ((Vector3)cameraPos - Camera.main.ScreenToWorldPoint(Input.mousePosition) + (Vector3)Camera.main.ScreenToWorldPoint(clickPnt)); + Camera.main.transform.position = new Vector3(Camera.main.transform.position.x, Camera.main.transform.position.y, -10); + } + } + // if (Input.GetMouseButtonDown(1)) + // { + // ShipMove(Camera.main.ScreenToWorldPoint(Input.mousePosition)); + // } + } + } + } + // void UpdateInteractList() + // { + // if (selectedInt.Count > 0) + // { + // // Debug.Log(selectedInt[0].interactType + " " + InteractControl.GetInstance().interactOptions[selectedInt[0].interactType]); + // enabledInteract = new List(InteractControl.GetInstance().interactOptions[selectedInt[0].interactType]); + // // Debug.Log(InteractControl.GetInstance().interactOptions[InteractControl.InteractType.Base].Count); + // foreach (InteractBase interactBase in selectedInt) + // { + // for (int i = 0; i < enabledInteract.Count; i++) + // if (!InteractControl.GetInstance().interactOptions[interactBase.interactType].Contains(enabledInteract[i])) + // { + // enabledInteract.Remove(enabledInteract[i]); + // } + // } + // } + // else + // { + // if (enabledInteract.Count > 0) + // enabledInteract.Clear(); + // } + // } + // void Interact() + // { + // foreach (InteractBase interactBase in selectedInt) + // { + // interactBase.interactOption = selectedOption; + // } + // selectedOption = InteractControl.InteractOption.None; + // } + // void ShipMove(Vector2 movePos) + // { + // foreach (InteractBase interactBase in selectedInt) + // { + // interactBase.enableMove = true; + // interactBase.moveOption = movePos; + // } + // } + // void ShipAttack() + // { + // foreach (InteractBase interactBase in selectedInt) + // { + // interactBase.attackOption = Camera.main.ScreenToWorldPoint(Input.mousePosition); + // } + // } + // public void ButtonInteract(InteractControl.InteractOption option) + // { + // selectedOption = option; + // } +} \ No newline at end of file diff --git a/interface/interface_live/Assets/Scripts/PlayerControl.cs.meta b/interface/interface_live/Assets/Scripts/PlayerControl.cs.meta new file mode 100644 index 00000000..58d447ec --- /dev/null +++ b/interface/interface_live/Assets/Scripts/PlayerControl.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 06c5c0b9b2b04ee4d9ef11f3605fc8ea +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/interface/interface_live/Assets/Scripts/Render/RenderManager.cs b/interface/interface_live/Assets/Scripts/Render/RenderManager.cs index 3ef116d6..b2f55596 100644 --- a/interface/interface_live/Assets/Scripts/Render/RenderManager.cs +++ b/interface/interface_live/Assets/Scripts/Render/RenderManager.cs @@ -3,28 +3,79 @@ using UnityEngine; using Protobuf; using System; +using Newtonsoft.Json; +using Unity.Mathematics; +using Unity.Collections.LowLevel.Unsafe; +using TMPro; +using System.Linq; +using UnityEngine.Rendering; public class RenderManager : SingletonMono { + // int cnt = 0; + bool callTimeOver = false; + public TextMeshProUGUI gameTime, score, energy, fi; + JsonSerializerSettings jSetting = new JsonSerializerSettings + { + + NullValueHandling = NullValueHandling.Ignore, + ContractResolver = new Newtonsoft.Json.Serialization.CamelCasePropertyNamesContractResolver() + }; // Start is called before the first frame update void Start() { + StartCoroutine(updateFrame()); } // Update is called once per frame void Update() { - DealFrame(CoreParam.frameQueue.GetValue(0)); - ShowFrame(); + } - void DealFrame(MessageToClient info) + IEnumerator updateFrame() { - if (info.GameState == GameState.GameRunning) + if (CoreParam.frameQueue.GetSize() < 50) + { + StartCoroutine(CalTimems(25)); + fi.text = "fi: " + 25; + } + else { - foreach (MessageOfObj obj in info.ObjMessage) + while (CoreParam.frameQueue.GetSize() > 100) { - DealObj(obj); + CoreParam.frameQueue.GetValue(); } + StartCoroutine(CalTimems(1250 / CoreParam.frameQueue.GetSize())); + fi.text = "fi: " + (1250 / CoreParam.frameQueue.GetSize()); + } + if (!CoreParam.initialized && CoreParam.firstFrame != null) + { + DealFrame(CoreParam.firstFrame); + ShowFrame(); + } + CoreParam.currentFrame = CoreParam.frameQueue.GetValue(); + if (CoreParam.currentFrame != null) + { + DealFrame(CoreParam.currentFrame); + ShowFrame(); + } + while (!callTimeOver) + yield return 0; + StartCoroutine(updateFrame()); + } + IEnumerator CalTimems(int count) + { + callTimeOver = false; + yield return new WaitForSeconds((float)count / 1000); + callTimeOver = true; + } + void DealFrame(MessageToClient info) + { + CoreParam.bullets.Clear(); + CoreParam.ships.Clear(); + foreach (MessageOfObj obj in info.ObjMessage) + { + DealObj(obj); } } void DealObj(MessageOfObj obj) @@ -35,15 +86,11 @@ void DealObj(MessageOfObj obj) CoreParam.map = obj.MapMessage; break; case MessageOfObj.MessageOfObjOneofCase.ShipMessage: - Debug.Log("receive shipmessage" + obj.ShipMessage); - CoreParam.ships[obj.ShipMessage.TeamId * 4 + obj.ShipMessage.PlayerId] = obj.ShipMessage; + CoreParam.ships[obj.ShipMessage.TeamId * 4 + obj.ShipMessage.PlayerId - 1] = obj.ShipMessage; break; case MessageOfObj.MessageOfObjOneofCase.BulletMessage: CoreParam.bullets[obj.BulletMessage.Guid] = obj.BulletMessage; break; - case MessageOfObj.MessageOfObjOneofCase.BombedBulletMessage: - CoreParam.bombedBullets[obj.BombedBulletMessage.MappingId] = obj.BombedBulletMessage; - break; case MessageOfObj.MessageOfObjOneofCase.HomeMessage: CoreParam.homes[obj.HomeMessage.TeamId] = obj.HomeMessage; break; @@ -54,12 +101,17 @@ void DealObj(MessageOfObj obj) CoreParam.resources[new Tuple(obj.ResourceMessage.X, obj.ResourceMessage.Y)] = obj.ResourceMessage; break; case MessageOfObj.MessageOfObjOneofCase.WormholeMessage: + CoreParam.wormholes[new Tuple(obj.WormholeMessage.X, obj.WormholeMessage.Y)] = obj.WormholeMessage; break; case MessageOfObj.MessageOfObjOneofCase.CommunityMessage: + CoreParam.communities[new Tuple(obj.CommunityMessage.X, obj.CommunityMessage.Y)] = obj.CommunityMessage; break; case MessageOfObj.MessageOfObjOneofCase.FactoryMessage: + CoreParam.factories[new Tuple(obj.FactoryMessage.X, obj.FactoryMessage.Y)] = obj.FactoryMessage; break; case MessageOfObj.MessageOfObjOneofCase.FortMessage: + CoreParam.forts[new Tuple(obj.FortMessage.X, obj.FortMessage.Y)] = obj.FortMessage; + Debug.Log("fort"); break; case MessageOfObj.MessageOfObjOneofCase.NewsMessage: break; @@ -71,52 +123,212 @@ void ShowFrame() { if (!CoreParam.initialized) { - ShowShip(CoreParam.ships); ShowMap(CoreParam.map); + ShowAllMessage(CoreParam.firstFrame); CoreParam.initialized = true; } + else + { + ShowShip(CoreParam.ships); + ShowBullet(CoreParam.bullets); + ShowFactory(CoreParam.factories); + ShowCommunity(CoreParam.communities); + ShowFort(CoreParam.forts); + ShowAllMessage(CoreParam.currentFrame); + } } void ShowMap(MessageOfMap map) { - for (int row = 1; row <= map.Height; row++) + for (int row = 0; row < map.Height; row++) + for (int col = 0; col < map.Width; col++) + ObjCreater.GetInstance().CreateObj(map.Rows[row].Cols[col], Tool.GetInstance().CellToUxy(row, col)); + } + void ShowShip(Dictionary ships) + { + foreach (KeyValuePair ship in ships) { - for (int col = 1; col <= map.Width; col++) + if (ship.Value != null) { - ObjCreater.GetInstance().CreateObj(map.Rows[row].Cols[col], new Vector2(col, 50 - row)); - switch (map.Rows[row].Cols[col]) + if (!CoreParam.shipsG.ContainsKey(ship.Key)) { - case PlaceType.Home: - break; - case PlaceType.Space: - break; - case PlaceType.Shadow: - break; - case PlaceType.Construction: - break; - case PlaceType.Ruin: - break; - case PlaceType.Asteroid: - break; - case PlaceType.Resource: - break; - case PlaceType.Wormhole: - break; - default: - break; + CoreParam.shipsG[ship.Value.TeamId * 4 + ship.Value.PlayerId - 1] = + ObjCreater.GetInstance().CreateObj(ship.Value.ShipType, + Tool.GetInstance().GridToUxy(ship.Value.X, ship.Value.Y)); + RendererControl.GetInstance().SetColToChild((PlayerTeam)(ship.Value.TeamId + 1), + CoreParam.shipsG[ship.Value.TeamId * 4 + ship.Value.PlayerId - 1].transform); + } + else + { + CoreParam.shipsG[ship.Value.TeamId * 4 + ship.Value.PlayerId - 1].transform.position = + Tool.GetInstance().GridToUxy(ship.Value.X, ship.Value.Y); + CoreParam.shipsG[ship.Value.TeamId * 4 + ship.Value.PlayerId - 1].transform.rotation = + Quaternion.AngleAxis((float)ship.Value.FacingDirection * Mathf.Rad2Deg + 180, Vector3.forward); + } + } + } + for (int i = 0; i < CoreParam.shipsG.Count; i++) + { + KeyValuePair shipG = CoreParam.shipsG.ElementAt(i); + if (shipG.Value != null) + { + if (!CoreParam.ships.ContainsKey(shipG.Key)) + { + Destroy(shipG.Value); + CoreParam.bulletsG.Remove(shipG.Key); } } } } - void ShowShip(MessageOfShip[] ships) + void ShowBullet(Dictionary bullets) { - foreach (MessageOfShip ship in ships) + foreach (KeyValuePair bullet in bullets) { - Debug.Log(ship); - if (!CoreParam.shipsG[ship.TeamId * 4 + ship.PlayerId]) + if (bullet.Value != null) { - CoreParam.shipsG[ship.TeamId * 4 + ship.PlayerId] = ObjCreater.GetInstance().CreateObj(ship.ShipType, new Vector2(ship.X, ship.Y)); + if (!CoreParam.bulletsG.ContainsKey(bullet.Key)) + { + CoreParam.bulletsG[bullet.Key] = + ObjCreater.GetInstance().CreateObj(bullet.Value.Type, + Tool.GetInstance().GridToUxy(bullet.Value.X, bullet.Value.Y), + Quaternion.AngleAxis((float)bullet.Value.FacingDirection * Mathf.Rad2Deg + 180, Vector3.forward)); + RendererControl.GetInstance().SetColToChild((PlayerTeam)(bullet.Value.TeamId + 1), + CoreParam.bulletsG[bullet.Key].transform); + // CoreParam.bulletsG[bullet.Key] + } + else + { + CoreParam.bulletsG[bullet.Key].transform.position = Tool.GetInstance().GridToUxy(bullet.Value.X, bullet.Value.Y); + CoreParam.bulletsG[bullet.Key].transform.rotation = + Quaternion.AngleAxis((float)bullet.Value.FacingDirection * Mathf.Rad2Deg + 180, Vector3.forward); + } } } + for (int i = 0; i < CoreParam.bulletsG.Count; i++) + { + KeyValuePair bulletG = CoreParam.bulletsG.ElementAt(i); + if (bulletG.Value != null) + { + if (!CoreParam.bullets.ContainsKey(bulletG.Key)) + { + Destroy(bulletG.Value); + CoreParam.bulletsG.Remove(bulletG.Key); + } + } + } + } + void ShowFactory(Dictionary, MessageOfFactory> factories) + { + foreach (KeyValuePair, MessageOfFactory> factory in factories) + { + if (factory.Value != null) + { + if (!CoreParam.factoriesG.ContainsKey(factory.Key)) + { + CoreParam.factoriesG[factory.Key] = + ObjCreater.GetInstance().CreateObj(ConstructionType.Factory, + Tool.GetInstance().GridToUxy(factory.Value.X, factory.Value.Y)); + // RendererControl.GetInstance().SetColToChild((PlayerTeam)(factory.Value.TeamId + 1), + // CoreParam.factoriesG[factory.Key].transform, 5); + + } + else + { + CoreParam.factoriesG[factory.Key].transform.position = Tool.GetInstance().GridToUxy(factory.Value.X, factory.Value.Y); + // CoreParam.factoriesG[factory.Key].transform.rotation = + // Quaternion.AngleAxis((float)factory.Value.FacingDirection * Mathf.Rad2Deg + 180, Vector3.forward); + } + } + } + for (int i = 0; i < CoreParam.factoriesG.Count; i++) + { + KeyValuePair, GameObject> factoryG = CoreParam.factoriesG.ElementAt(i); + if (factoryG.Value != null) + { + if (!CoreParam.factories.ContainsKey(factoryG.Key)) + { + Destroy(factoryG.Value); + CoreParam.factoriesG.Remove(factoryG.Key); + } + } + } + } + void ShowCommunity(Dictionary, MessageOfCommunity> communities) + { + foreach (KeyValuePair, MessageOfCommunity> community in communities) + { + if (community.Value != null) + { + if (!CoreParam.communitiesG.ContainsKey(community.Key)) + { + CoreParam.communitiesG[community.Key] = + ObjCreater.GetInstance().CreateObj(ConstructionType.Community, + Tool.GetInstance().GridToUxy(community.Value.X, community.Value.Y)); + // RendererControl.GetInstance().SetColToChild((PlayerTeam)(community.Value.TeamId + 1), + // CoreParam.communitiesG[community.Key].transform); + + } + else + { + CoreParam.communitiesG[community.Key].transform.position = Tool.GetInstance().GridToUxy(community.Value.X, community.Value.Y); + // CoreParam.communitiesG[community.Key].transform.rotation = + // Quaternion.AngleAxis((float)community.Value.FacingDirection * Mathf.Rad2Deg + 180, Vector3.forward); + } + } + } + for (int i = 0; i < CoreParam.communitiesG.Count; i++) + { + KeyValuePair, GameObject> communityG = CoreParam.communitiesG.ElementAt(i); + if (communityG.Value != null) + { + if (!CoreParam.communities.ContainsKey(communityG.Key)) + { + Destroy(communityG.Value); + CoreParam.communitiesG.Remove(communityG.Key); + } + } + } + } + void ShowFort(Dictionary, MessageOfFort> forts) + { + foreach (KeyValuePair, MessageOfFort> fort in forts) + { + if (fort.Value != null) + { + if (!CoreParam.fortsG.ContainsKey(fort.Key)) + { + CoreParam.fortsG[fort.Key] = + ObjCreater.GetInstance().CreateObj(ConstructionType.Fort, + Tool.GetInstance().GridToUxy(fort.Value.X, fort.Value.Y), fort.Value.TeamId == 1); + RendererControl.GetInstance().SetColToChild((PlayerTeam)(fort.Value.TeamId + 1), + CoreParam.fortsG[fort.Key].transform); + + } + else + { + CoreParam.fortsG[fort.Key].transform.position = Tool.GetInstance().GridToUxy(fort.Value.X, fort.Value.Y); + // CoreParam.fortsG[fort.Key].transform.rotation = + // Quaternion.AngleAxis((float)fort.Value.FacingDirection * Mathf.Rad2Deg + 180, Vector3.forward); + } + } + } + for (int i = 0; i < CoreParam.fortsG.Count; i++) + { + KeyValuePair, GameObject> fortG = CoreParam.fortsG.ElementAt(i); + if (fortG.Value != null) + { + if (!CoreParam.forts.ContainsKey(fortG.Key)) + { + Destroy(fortG.Value); + CoreParam.fortsG.Remove(fortG.Key); + } + } + } + } + void ShowAllMessage(MessageToClient messageToClient) + { + gameTime.text = "GameTime:" + messageToClient.AllMessage.GameTime; + score.text = "Score(Red:Blue):" + messageToClient.AllMessage.RedTeamScore + ":" + messageToClient.AllMessage.BlueTeamScore; + energy.text = "Energy(Red:Blue):" + messageToClient.AllMessage.RedTeamEnergy + ":" + messageToClient.AllMessage.BlueTeamEnergy; } } diff --git a/interface/interface_live/Assets/Scripts/Render/Tool.cs b/interface/interface_live/Assets/Scripts/Render/Tool.cs index 5e018bfe..3cd61391 100644 --- a/interface/interface_live/Assets/Scripts/Render/Tool.cs +++ b/interface/interface_live/Assets/Scripts/Render/Tool.cs @@ -9,6 +9,14 @@ public int GetRandom(int min, int max) { return a.Next(min, max); } + public Vector2 CellToUxy(int cellx, int celly) + { + return new Vector2(celly, 50 - cellx); + } + public Vector2 GridToUxy(float gridx, float gridy) + { + return new Vector2(gridy / 1000 - 0.5f, 50.5f - gridx / 1000); + } public Vector2 GridToCell(Vector2 grid) { return new Vector2((int)(grid.x + 0.5f), (int)(grid.y + 0.5f)); diff --git a/interface/interface_live/Assets/Scripts/RendererControl.cs b/interface/interface_live/Assets/Scripts/RendererControl.cs new file mode 100644 index 00000000..8d2c1f4a --- /dev/null +++ b/interface/interface_live/Assets/Scripts/RendererControl.cs @@ -0,0 +1,129 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using Protobuf; + +public class RendererControl : Singleton +{ + + Renderer CurrentRenderer = new Renderer(); + MaterialPropertyBlock CurrentPropertyBlock = new MaterialPropertyBlock(); + Color litColor = new Color(); + public void SetColToChild(PlayerTeam playerTeam, Transform targetTransform, float idensityRevise = 1) + { + switch (playerTeam) + { + case PlayerTeam.Red: + Debug.Log("paintred"); + if (targetTransform.Find("mask1").TryGetComponent(out CurrentRenderer)) + { + CurrentRenderer.GetPropertyBlock(CurrentPropertyBlock); + litColor = new Color( + ParaDefine.GetInstance().Team0Color[0].color.r * Mathf.Pow(2, ParaDefine.GetInstance().Team0Color[0].idensity * idensityRevise), + ParaDefine.GetInstance().Team0Color[0].color.g * Mathf.Pow(2, ParaDefine.GetInstance().Team0Color[0].idensity * idensityRevise), + ParaDefine.GetInstance().Team0Color[0].color.b * Mathf.Pow(2, ParaDefine.GetInstance().Team0Color[0].idensity * idensityRevise), + 0); + CurrentPropertyBlock.SetColor("_GlowColor", litColor); + CurrentRenderer.SetPropertyBlock(CurrentPropertyBlock); + } + if (targetTransform.Find("mask2")) + { + if (targetTransform.Find("mask2").TryGetComponent(out CurrentRenderer)) + { + CurrentRenderer.GetPropertyBlock(CurrentPropertyBlock); + litColor = new Color( + ParaDefine.GetInstance().Team0Color[1].color.r * Mathf.Pow(2, ParaDefine.GetInstance().Team0Color[1].idensity * idensityRevise), + ParaDefine.GetInstance().Team0Color[1].color.g * Mathf.Pow(2, ParaDefine.GetInstance().Team0Color[1].idensity * idensityRevise), + ParaDefine.GetInstance().Team0Color[1].color.b * Mathf.Pow(2, ParaDefine.GetInstance().Team0Color[1].idensity * idensityRevise), + 0); + CurrentPropertyBlock.SetColor("_GlowColor", litColor); + CurrentRenderer.SetPropertyBlock(CurrentPropertyBlock); + } + } + return; + case PlayerTeam.Blue: + if (targetTransform.Find("mask1").TryGetComponent(out CurrentRenderer)) + { + CurrentRenderer.GetPropertyBlock(CurrentPropertyBlock); + litColor = new Color( + ParaDefine.GetInstance().Team1Color[0].color.r * Mathf.Pow(2, ParaDefine.GetInstance().Team1Color[0].idensity * idensityRevise), + ParaDefine.GetInstance().Team1Color[0].color.g * Mathf.Pow(2, ParaDefine.GetInstance().Team1Color[0].idensity * idensityRevise), + ParaDefine.GetInstance().Team1Color[0].color.b * Mathf.Pow(2, ParaDefine.GetInstance().Team1Color[0].idensity * idensityRevise), + 0); + CurrentPropertyBlock.SetColor("_GlowColor", litColor); + CurrentRenderer.SetPropertyBlock(CurrentPropertyBlock); + } + if (targetTransform.Find("mask2")) + { + if (targetTransform.Find("mask2").TryGetComponent(out CurrentRenderer)) + { + CurrentRenderer.GetPropertyBlock(CurrentPropertyBlock); + litColor = new Color( + ParaDefine.GetInstance().Team1Color[1].color.r * Mathf.Pow(2, ParaDefine.GetInstance().Team1Color[1].idensity * idensityRevise), + ParaDefine.GetInstance().Team1Color[1].color.g * Mathf.Pow(2, ParaDefine.GetInstance().Team1Color[1].idensity * idensityRevise), + ParaDefine.GetInstance().Team1Color[1].color.b * Mathf.Pow(2, ParaDefine.GetInstance().Team1Color[1].idensity * idensityRevise), + 0); + CurrentPropertyBlock.SetColor("_GlowColor", litColor); + CurrentRenderer.SetPropertyBlock(CurrentPropertyBlock); + } + } + return; + default: return; + } + } + public void SetColToChild(PlaceType placeType, Transform targetTransform) + { + switch (placeType) + { + case PlaceType.Resource: + CurrentRenderer = targetTransform.Find("mask1").GetComponent(); + if (CurrentRenderer) + { + CurrentRenderer.GetPropertyBlock(CurrentPropertyBlock); + litColor = new Color( + ParaDefine.GetInstance().ResourceColor[0].color.r * Mathf.Pow(2, ParaDefine.GetInstance().ResourceColor[0].idensity), + ParaDefine.GetInstance().ResourceColor[0].color.g * Mathf.Pow(2, ParaDefine.GetInstance().ResourceColor[0].idensity), + ParaDefine.GetInstance().ResourceColor[0].color.b * Mathf.Pow(2, ParaDefine.GetInstance().ResourceColor[0].idensity), + 0); + CurrentPropertyBlock.SetColor("_GlowColor", litColor); + CurrentRenderer.SetPropertyBlock(CurrentPropertyBlock); + } + CurrentRenderer = targetTransform.Find("mask2").GetComponent(); + if (CurrentRenderer) + { + CurrentRenderer.GetPropertyBlock(CurrentPropertyBlock); + litColor = new Color( + ParaDefine.GetInstance().ResourceColor[0].color.r * Mathf.Pow(2, ParaDefine.GetInstance().ResourceColor[0].idensity), + ParaDefine.GetInstance().ResourceColor[0].color.g * Mathf.Pow(2, ParaDefine.GetInstance().ResourceColor[0].idensity), + ParaDefine.GetInstance().ResourceColor[0].color.b * Mathf.Pow(2, ParaDefine.GetInstance().ResourceColor[0].idensity), + 0); + CurrentPropertyBlock.SetColor("_GlowColor", litColor); + CurrentRenderer.SetPropertyBlock(CurrentPropertyBlock); + } + return; + default: return; + } + } + public void SetColToChild(BulletType bulletType, PlayerTeam playerTeam, Transform targetTransform) + { + switch (bulletType) + { + case BulletType.Laser: + CurrentRenderer = targetTransform.Find("mask1").GetComponent(); + // Debug.Log("render bullet"); + if (CurrentRenderer) + { + CurrentRenderer.GetPropertyBlock(CurrentPropertyBlock); + litColor = new Color( + ParaDefine.GetInstance().LaserColor[(int)playerTeam].color.r * Mathf.Pow(2, ParaDefine.GetInstance().LaserColor[(int)playerTeam].idensity), + ParaDefine.GetInstance().LaserColor[(int)playerTeam].color.g * Mathf.Pow(2, ParaDefine.GetInstance().LaserColor[(int)playerTeam].idensity), + ParaDefine.GetInstance().LaserColor[(int)playerTeam].color.b * Mathf.Pow(2, ParaDefine.GetInstance().LaserColor[(int)playerTeam].idensity), + 0); + CurrentPropertyBlock.SetColor("_GlowColor", litColor); + CurrentRenderer.SetPropertyBlock(CurrentPropertyBlock); + } + return; + default: return; + } + } +} diff --git a/interface/interface_live/Assets/Scripts/RendererControl.cs.meta b/interface/interface_live/Assets/Scripts/RendererControl.cs.meta new file mode 100644 index 00000000..5b9fa331 --- /dev/null +++ b/interface/interface_live/Assets/Scripts/RendererControl.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 80418574b0c0a7b4bb49ecf0cae4ab72 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/interface/interface_live/Assets/message(1).json b/interface/interface_live/Assets/message(1).json new file mode 100644 index 00000000..5a64d9ff --- /dev/null +++ b/interface/interface_live/Assets/message(1).json @@ -0,0 +1 @@ +{"objMessageList":[{"mapMessage":{"height":50,"width":50,"rowsList":[{"colsList":[3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3]},{"colsList":[3,2,2,2,2,2,2,2,2,2,2,4,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,4,4,2,2,2,2,3]},{"colsList":[3,2,2,2,2,2,2,2,2,2,4,3,3,2,3,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,3,3,3,3,3,2,2,7,2,4,4,2,2,2,3]},{"colsList":[3,2,2,2,2,2,2,2,2,2,2,2,2,3,3,4,2,4,2,2,4,2,2,2,2,2,2,2,2,2,2,2,2,2,2,3,2,3,2,3,3,2,2,2,2,2,1,2,2,3]},{"colsList":[3,2,2,2,2,2,2,2,6,2,2,2,2,2,3,3,4,4,4,4,4,2,4,2,2,2,2,2,2,2,2,2,2,2,2,3,2,2,2,3,2,2,2,2,2,2,2,2,2,3]},{"colsList":[3,2,2,2,2,2,2,2,2,2,2,2,2,3,3,2,2,2,2,2,2,2,4,4,2,2,2,6,2,2,2,2,2,2,4,3,2,2,2,3,2,2,2,2,2,2,2,2,2,3]},{"colsList":[3,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,4,2,2,2,4,4,2,2,2,2,2,2,2,2,2,2,2,2,2,4,2,2,3,2,2,2,2,7,2,2,2,3]},{"colsList":[3,2,2,2,2,3,2,4,2,2,2,2,2,2,2,4,2,4,6,2,2,6,4,4,4,4,4,4,2,2,2,2,2,2,2,2,2,4,2,2,3,2,2,2,3,3,3,3,2,3]},{"colsList":[3,2,2,2,2,3,2,2,2,2,2,2,2,2,2,4,2,4,4,2,2,2,2,2,4,4,4,4,4,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,3,2,3,2,3]},{"colsList":[3,2,2,2,3,3,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,4,2,2,4,4,4,4,4,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,3,2,2,2,3]},{"colsList":[3,2,2,2,2,2,3,3,2,2,2,2,2,2,2,2,2,2,2,7,2,2,2,2,4,4,4,4,4,3,2,2,2,2,2,2,2,2,2,2,2,2,3,3,3,3,2,2,2,3]},{"colsList":[3,2,2,2,2,2,2,3,3,2,2,2,2,2,2,2,4,2,4,4,2,2,2,2,2,2,4,4,4,2,2,2,2,2,2,2,2,2,2,2,2,2,2,3,4,3,3,2,2,3]},{"colsList":[3,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,4,4,4,4,2,4,4,4,2,2,2,4,4,2,4,2,2,2,2,2,2,2,2,2,4,2,2,3,4,4,2,2,2,3]},{"colsList":[3,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,6,4,4,4,4,4,4,3,3,2,2,4,2,7,2,2,2,2,2,2,2,2,2,2,2,2,2,6,2,4,2,2,2,3]},{"colsList":[3,2,2,2,2,2,2,4,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,3,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,4,2,2,2,3]},{"colsList":[3,2,2,2,2,2,7,3,3,2,2,2,2,2,2,2,2,2,2,2,2,2,6,4,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,3]},{"colsList":[3,2,2,2,2,2,2,4,3,2,2,2,2,2,3,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,3]},{"colsList":[3,2,2,2,2,2,2,4,3,4,2,2,4,3,3,2,3,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,7,2,2,2,2,2,2,2,2,2,3]},{"colsList":[3,2,2,2,2,2,2,4,3,4,4,4,3,2,3,2,3,2,2,2,3,2,2,2,2,2,2,2,2,2,2,2,4,4,4,4,2,2,2,2,2,2,2,4,4,2,2,2,2,3]},{"colsList":[3,2,2,2,2,2,2,2,2,4,3,3,3,3,3,3,3,3,2,3,3,2,2,2,2,2,4,2,2,2,2,2,2,2,4,4,2,2,2,2,2,2,2,4,4,3,3,2,2,3]},{"colsList":[3,2,2,2,2,2,2,4,4,4,4,4,4,2,2,2,2,3,3,2,3,2,2,4,4,2,4,2,2,2,2,2,2,2,4,4,2,2,2,2,2,2,4,2,4,2,2,2,2,3]},{"colsList":[3,2,2,2,2,2,2,2,2,4,4,2,2,2,2,4,4,2,2,2,2,2,2,4,4,2,4,4,4,4,2,2,2,2,4,2,2,2,2,2,2,4,4,2,4,2,2,2,2,3]},{"colsList":[3,2,5,5,2,2,4,5,2,2,4,2,2,5,5,2,2,2,5,5,2,2,2,4,4,2,2,2,4,4,2,2,2,2,2,2,2,2,2,2,2,2,4,2,4,2,2,2,2,3]},{"colsList":[3,5,5,5,5,5,5,5,5,5,8,8,5,5,5,5,5,5,5,5,5,5,5,5,8,8,5,5,5,5,2,2,5,5,5,2,2,5,8,8,5,5,2,5,5,5,2,2,5,3]},{"colsList":[3,5,5,5,5,5,5,5,5,5,8,8,5,5,5,5,5,5,5,5,5,5,5,5,8,8,5,5,5,5,5,5,5,5,5,5,5,5,8,8,5,5,5,5,5,5,5,5,5,3]},{"colsList":[3,5,5,5,5,5,5,5,5,5,8,8,5,5,5,5,5,5,5,5,5,5,5,5,8,8,5,5,5,5,5,5,5,5,5,5,5,5,8,8,5,5,5,5,5,5,5,5,5,3]},{"colsList":[3,5,2,2,5,5,5,2,5,5,8,8,5,2,2,5,5,5,2,2,5,5,5,5,8,8,5,5,5,5,5,5,5,5,5,5,5,5,8,8,5,5,5,5,5,5,5,5,5,3]},{"colsList":[3,2,2,2,2,4,2,4,2,2,2,2,2,2,2,2,2,2,2,2,4,4,2,2,2,4,4,2,2,2,5,5,2,2,2,5,5,2,2,4,2,2,5,4,2,2,5,5,2,3]},{"colsList":[3,2,2,2,2,4,2,4,4,2,2,2,2,2,2,4,2,2,2,2,4,4,4,4,2,4,4,2,2,2,2,2,2,4,4,2,2,2,2,4,4,2,2,2,2,2,2,2,2,3]},{"colsList":[3,2,2,2,2,4,2,4,2,2,2,2,2,2,4,4,2,2,2,2,2,2,2,4,2,4,4,2,2,3,2,3,3,2,2,2,2,4,4,4,4,4,4,2,2,2,2,2,2,3]},{"colsList":[3,2,2,3,3,4,4,2,2,2,2,2,2,2,4,4,2,2,2,2,2,2,2,4,2,2,2,2,2,3,3,2,3,3,3,3,3,3,3,3,4,2,2,2,2,2,2,2,2,3]},{"colsList":[3,2,2,2,2,4,4,2,2,2,2,2,2,2,4,4,4,4,2,2,2,2,2,2,2,2,2,2,2,3,2,2,2,3,2,3,2,3,4,4,4,3,4,2,2,2,2,2,2,3]},{"colsList":[3,2,2,2,2,2,2,2,2,2,7,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,3,2,3,3,4,2,2,4,3,4,2,2,2,2,2,2,3]},{"colsList":[3,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,3,2,2,2,2,2,3,4,2,2,2,2,2,2,3]},{"colsList":[3,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,4,6,2,2,2,2,2,2,2,2,2,2,2,2,2,3,3,7,2,2,2,2,2,3]},{"colsList":[3,2,2,2,4,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,3,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,4,2,2,2,2,2,2,3]},{"colsList":[3,2,2,2,4,2,6,2,2,2,2,2,2,2,2,2,2,2,2,2,7,2,4,2,2,3,3,4,4,4,4,4,4,6,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,3]},{"colsList":[3,2,2,2,4,4,3,2,2,4,2,2,2,2,2,2,2,2,2,4,2,4,4,2,2,2,4,4,4,2,4,4,4,4,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,3]},{"colsList":[3,2,2,3,3,4,3,2,2,2,2,2,2,2,2,2,2,2,2,2,2,4,4,4,2,2,2,2,2,2,4,4,2,4,2,2,2,2,2,2,2,3,3,2,2,2,2,2,2,3]},{"colsList":[3,2,2,2,3,3,3,3,2,2,2,2,2,2,2,2,2,2,2,2,3,4,4,4,4,4,2,2,2,2,7,2,2,2,2,2,2,2,2,2,2,2,3,3,2,2,2,2,2,3]},{"colsList":[3,2,2,2,3,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,4,4,4,4,4,2,2,4,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,3,3,2,2,2,3]},{"colsList":[3,2,3,2,3,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,4,4,4,4,4,2,2,2,2,2,4,4,2,4,2,2,2,2,2,2,2,2,2,3,2,2,2,2,3]},{"colsList":[3,2,3,3,3,3,2,2,2,3,2,2,4,2,2,2,2,2,2,2,2,2,4,4,4,4,4,4,6,2,2,6,4,2,4,2,2,2,2,2,2,2,4,2,3,2,2,2,2,3]},{"colsList":[3,2,2,2,7,2,2,2,2,3,2,2,4,2,2,2,2,2,2,2,2,2,2,2,2,2,4,4,2,2,2,4,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,3]},{"colsList":[3,2,2,2,2,2,2,2,2,2,3,2,2,2,3,4,2,2,2,2,2,2,6,2,2,2,4,4,2,2,2,2,2,2,2,3,3,2,2,2,2,2,2,2,2,2,2,2,2,3]},{"colsList":[3,2,2,2,2,2,2,2,2,2,3,2,2,2,3,2,2,2,2,2,2,2,2,2,2,2,2,4,2,4,4,4,4,4,3,3,2,2,2,2,2,6,2,2,2,2,2,2,2,3]},{"colsList":[3,2,2,1,2,2,2,2,2,3,3,2,3,2,3,2,2,2,2,2,2,2,2,2,2,2,2,2,2,4,2,2,4,2,4,3,3,2,2,2,2,2,2,2,2,2,2,2,2,3]},{"colsList":[3,2,2,2,4,4,2,7,2,2,3,3,3,3,3,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,3,2,3,3,4,2,2,2,2,2,2,2,2,2,3]},{"colsList":[3,2,2,2,2,4,4,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,4,2,2,2,2,2,2,2,2,2,2,3]},{"colsList":[3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3]}]}},{"shipMessage":{"x":2500,"y":47500,"speed":3000,"hp":3000,"armor":0,"shield":0,"teamId":0,"playerId":1,"guid":850,"shipState":1,"shipType":1,"viewRange":8000,"producerType":1,"constructorType":1,"armorType":0,"shieldType":0,"weaponType":0,"facingDirection":0}},{"resourceMessage":{"x":4500,"y":8500,"progress":16000}},{"resourceMessage":{"x":5500,"y":27500,"progress":16000}},{"resourceMessage":{"x":7500,"y":18500,"progress":16000}},{"resourceMessage":{"x":7500,"y":21500,"progress":16000}},{"resourceMessage":{"x":13500,"y":16500,"progress":16000}},{"resourceMessage":{"x":13500,"y":43500,"progress":16000}},{"resourceMessage":{"x":15500,"y":22500,"progress":16000}},{"resourceMessage":{"x":34500,"y":27500,"progress":16000}},{"resourceMessage":{"x":36500,"y":6500,"progress":16000}},{"resourceMessage":{"x":36500,"y":33500,"progress":16000}},{"resourceMessage":{"x":42500,"y":28500,"progress":16000}},{"resourceMessage":{"x":42500,"y":31500,"progress":16000}},{"resourceMessage":{"x":44500,"y":22500,"progress":16000}},{"resourceMessage":{"x":45500,"y":41500,"progress":16000}},{"wormholeMessage":{"x":23500,"y":10500,"hp":0,"id":0}},{"wormholeMessage":{"x":23500,"y":11500,"hp":0,"id":0}},{"wormholeMessage":{"x":23500,"y":24500,"hp":18000,"id":1}},{"wormholeMessage":{"x":23500,"y":25500,"hp":18000,"id":1}},{"wormholeMessage":{"x":23500,"y":38500,"hp":0,"id":2}},{"wormholeMessage":{"x":23500,"y":39500,"hp":0,"id":2}},{"wormholeMessage":{"x":24500,"y":10500,"hp":0,"id":0}},{"wormholeMessage":{"x":24500,"y":11500,"hp":0,"id":0}},{"wormholeMessage":{"x":24500,"y":24500,"hp":18000,"id":1}},{"wormholeMessage":{"x":24500,"y":25500,"hp":18000,"id":1}},{"wormholeMessage":{"x":24500,"y":38500,"hp":0,"id":2}},{"wormholeMessage":{"x":24500,"y":39500,"hp":0,"id":2}},{"wormholeMessage":{"x":25500,"y":10500,"hp":0,"id":0}},{"wormholeMessage":{"x":25500,"y":11500,"hp":0,"id":0}},{"wormholeMessage":{"x":25500,"y":24500,"hp":18000,"id":1}},{"wormholeMessage":{"x":25500,"y":25500,"hp":18000,"id":1}},{"wormholeMessage":{"x":25500,"y":38500,"hp":0,"id":2}},{"wormholeMessage":{"x":25500,"y":39500,"hp":0,"id":2}},{"wormholeMessage":{"x":26500,"y":10500,"hp":0,"id":0}},{"wormholeMessage":{"x":26500,"y":11500,"hp":0,"id":0}},{"wormholeMessage":{"x":26500,"y":24500,"hp":18000,"id":1}},{"wormholeMessage":{"x":26500,"y":25500,"hp":18000,"id":1}},{"wormholeMessage":{"x":26500,"y":38500,"hp":0,"id":2}},{"wormholeMessage":{"x":26500,"y":39500,"hp":0,"id":2}},{"homeMessage":{"x":3500,"y":46500,"hp":24000,"teamId":0}},{"homeMessage":{"x":46500,"y":3500,"hp":24000,"teamId":1}},{"teamMessage":{"teamId":0,"playerId":0,"score":44672,"energy":44672}},{"teamMessage":{"teamId":1,"playerId":0,"score":44669,"energy":44669}}],"gameState":2,"allMessage":{"gameTime":396735,"redTeamScore":44672,"blueTeamScore":44669,"redTeamEnergy":44672,"blueTeamEnergy":44669,"redHomeHp":24000,"blueHomeHp":24000}} diff --git a/interface/interface_live/Assets/message(1).json.meta b/interface/interface_live/Assets/message(1).json.meta new file mode 100644 index 00000000..5997199c --- /dev/null +++ b/interface/interface_live/Assets/message(1).json.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: c819750b0c4ed0c428fcf46be5436e2e +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/interface/interface_live/Assets/message.json b/interface/interface_live/Assets/message.json new file mode 100644 index 00000000..f5587b19 --- /dev/null +++ b/interface/interface_live/Assets/message.json @@ -0,0 +1,358 @@ +{ + "objMessageList": [ + { + "shipMessage": { + "x": 1000, + "y": 49000, + "speed": 3000, + "hp": 3000, + "armor": 0, + "shield": 0, + "teamId": 0, + "playerId": 1, + "guid": 850, + "shipState": 1, + "shipType": 1, + "viewRange": 8000, + "producerType": 1, + "constructorType": 1, + "armorType": 0, + "shieldType": 0, + "weaponType": 0, + "facingDirection": -1.5707963267948966 + } + }, + { + "resourceMessage": { + "x": 4500, + "y": 8500, + "progress": 16000 + } + }, + { + "resourceMessage": { + "x": 5500, + "y": 27500, + "progress": 16000 + } + }, + { + "resourceMessage": { + "x": 7500, + "y": 18500, + "progress": 16000 + } + }, + { + "resourceMessage": { + "x": 7500, + "y": 21500, + "progress": 16000 + } + }, + { + "resourceMessage": { + "x": 13500, + "y": 16500, + "progress": 16000 + } + }, + { + "resourceMessage": { + "x": 13500, + "y": 43500, + "progress": 16000 + } + }, + { + "resourceMessage": { + "x": 15500, + "y": 22500, + "progress": 16000 + } + }, + { + "resourceMessage": { + "x": 34500, + "y": 27500, + "progress": 16000 + } + }, + { + "resourceMessage": { + "x": 36500, + "y": 6500, + "progress": 16000 + } + }, + { + "resourceMessage": { + "x": 36500, + "y": 33500, + "progress": 16000 + } + }, + { + "resourceMessage": { + "x": 42500, + "y": 28500, + "progress": 16000 + } + }, + { + "resourceMessage": { + "x": 42500, + "y": 31500, + "progress": 16000 + } + }, + { + "resourceMessage": { + "x": 44500, + "y": 22500, + "progress": 16000 + } + }, + { + "resourceMessage": { + "x": 45500, + "y": 41500, + "progress": 16000 + } + }, + { + "wormholeMessage": { + "x": 23500, + "y": 10500, + "hp": 0, + "id": 0 + } + }, + { + "wormholeMessage": { + "x": 23500, + "y": 11500, + "hp": 0, + "id": 0 + } + }, + { + "wormholeMessage": { + "x": 23500, + "y": 24500, + "hp": 18000, + "id": 1 + } + }, + { + "wormholeMessage": { + "x": 23500, + "y": 25500, + "hp": 18000, + "id": 1 + } + }, + { + "wormholeMessage": { + "x": 23500, + "y": 38500, + "hp": 0, + "id": 2 + } + }, + { + "wormholeMessage": { + "x": 23500, + "y": 39500, + "hp": 0, + "id": 2 + } + }, + { + "wormholeMessage": { + "x": 24500, + "y": 10500, + "hp": 0, + "id": 0 + } + }, + { + "wormholeMessage": { + "x": 24500, + "y": 11500, + "hp": 0, + "id": 0 + } + }, + { + "wormholeMessage": { + "x": 24500, + "y": 24500, + "hp": 18000, + "id": 1 + } + }, + { + "wormholeMessage": { + "x": 24500, + "y": 25500, + "hp": 18000, + "id": 1 + } + }, + { + "wormholeMessage": { + "x": 24500, + "y": 38500, + "hp": 0, + "id": 2 + } + }, + { + "wormholeMessage": { + "x": 24500, + "y": 39500, + "hp": 0, + "id": 2 + } + }, + { + "wormholeMessage": { + "x": 25500, + "y": 10500, + "hp": 0, + "id": 0 + } + }, + { + "wormholeMessage": { + "x": 25500, + "y": 11500, + "hp": 0, + "id": 0 + } + }, + { + "wormholeMessage": { + "x": 25500, + "y": 24500, + "hp": 18000, + "id": 1 + } + }, + { + "wormholeMessage": { + "x": 25500, + "y": 25500, + "hp": 18000, + "id": 1 + } + }, + { + "wormholeMessage": { + "x": 25500, + "y": 38500, + "hp": 0, + "id": 2 + } + }, + { + "wormholeMessage": { + "x": 25500, + "y": 39500, + "hp": 0, + "id": 2 + } + }, + { + "wormholeMessage": { + "x": 26500, + "y": 10500, + "hp": 0, + "id": 0 + } + }, + { + "wormholeMessage": { + "x": 26500, + "y": 11500, + "hp": 0, + "id": 0 + } + }, + { + "wormholeMessage": { + "x": 26500, + "y": 24500, + "hp": 18000, + "id": 1 + } + }, + { + "wormholeMessage": { + "x": 26500, + "y": 25500, + "hp": 18000, + "id": 1 + } + }, + { + "wormholeMessage": { + "x": 26500, + "y": 38500, + "hp": 0, + "id": 2 + } + }, + { + "wormholeMessage": { + "x": 26500, + "y": 39500, + "hp": 0, + "id": 2 + } + }, + { + "homeMessage": { + "x": 3500, + "y": 46500, + "hp": 24000, + "teamId": 0 + } + }, + { + "homeMessage": { + "x": 46500, + "y": 3500, + "hp": 24000, + "teamId": 1 + } + }, + { + "teamMessage": { + "teamId": 0, + "playerId": 0, + "score": 21258, + "energy": 21258 + } + }, + { + "teamMessage": { + "teamId": 1, + "playerId": 0, + "score": 21258, + "energy": 21258 + } + } + ], + "gameState": 2, + "allMessage": { + "gameTime": 162610, + "redTeamScore": 21258, + "blueTeamScore": 21258, + "redTeamEnergy": 21258, + "blueTeamEnergy": 21258, + "redHomeHp": 24000, + "blueHomeHp": 24000 + } +} \ No newline at end of file diff --git a/interface/interface_live/Assets/message.json.meta b/interface/interface_live/Assets/message.json.meta new file mode 100644 index 00000000..9d4fa94f --- /dev/null +++ b/interface/interface_live/Assets/message.json.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 2c68217117d856443bd369ab3c4290ad +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/interface/interface_live/Assets/message2.json b/interface/interface_live/Assets/message2.json new file mode 100644 index 00000000..a9defbe4 --- /dev/null +++ b/interface/interface_live/Assets/message2.json @@ -0,0 +1,336 @@ +{ + "objMessageList": [ + { + "resourceMessage": { + "x": 4500, + "y": 8500, + "progress": 16000 + } + }, + { + "resourceMessage": { + "x": 5500, + "y": 27500, + "progress": 16000 + } + }, + { + "resourceMessage": { + "x": 7500, + "y": 18500, + "progress": 16000 + } + }, + { + "resourceMessage": { + "x": 7500, + "y": 21500, + "progress": 16000 + } + }, + { + "resourceMessage": { + "x": 13500, + "y": 16500, + "progress": 16000 + } + }, + { + "resourceMessage": { + "x": 13500, + "y": 43500, + "progress": 16000 + } + }, + { + "resourceMessage": { + "x": 15500, + "y": 22500, + "progress": 16000 + } + }, + { + "resourceMessage": { + "x": 34500, + "y": 27500, + "progress": 16000 + } + }, + { + "resourceMessage": { + "x": 36500, + "y": 6500, + "progress": 16000 + } + }, + { + "resourceMessage": { + "x": 36500, + "y": 33500, + "progress": 16000 + } + }, + { + "resourceMessage": { + "x": 42500, + "y": 28500, + "progress": 16000 + } + }, + { + "resourceMessage": { + "x": 42500, + "y": 31500, + "progress": 16000 + } + }, + { + "resourceMessage": { + "x": 44500, + "y": 22500, + "progress": 16000 + } + }, + { + "resourceMessage": { + "x": 45500, + "y": 41500, + "progress": 16000 + } + }, + { + "wormholeMessage": { + "x": 23500, + "y": 10500, + "hp": 0, + "id": 0 + } + }, + { + "wormholeMessage": { + "x": 23500, + "y": 11500, + "hp": 0, + "id": 0 + } + }, + { + "wormholeMessage": { + "x": 23500, + "y": 24500, + "hp": 18000, + "id": 1 + } + }, + { + "wormholeMessage": { + "x": 23500, + "y": 25500, + "hp": 18000, + "id": 1 + } + }, + { + "wormholeMessage": { + "x": 23500, + "y": 38500, + "hp": 0, + "id": 2 + } + }, + { + "wormholeMessage": { + "x": 23500, + "y": 39500, + "hp": 0, + "id": 2 + } + }, + { + "wormholeMessage": { + "x": 24500, + "y": 10500, + "hp": 0, + "id": 0 + } + }, + { + "wormholeMessage": { + "x": 24500, + "y": 11500, + "hp": 0, + "id": 0 + } + }, + { + "wormholeMessage": { + "x": 24500, + "y": 24500, + "hp": 18000, + "id": 1 + } + }, + { + "wormholeMessage": { + "x": 24500, + "y": 25500, + "hp": 18000, + "id": 1 + } + }, + { + "wormholeMessage": { + "x": 24500, + "y": 38500, + "hp": 0, + "id": 2 + } + }, + { + "wormholeMessage": { + "x": 24500, + "y": 39500, + "hp": 0, + "id": 2 + } + }, + { + "wormholeMessage": { + "x": 25500, + "y": 10500, + "hp": 0, + "id": 0 + } + }, + { + "wormholeMessage": { + "x": 25500, + "y": 11500, + "hp": 0, + "id": 0 + } + }, + { + "wormholeMessage": { + "x": 25500, + "y": 24500, + "hp": 18000, + "id": 1 + } + }, + { + "wormholeMessage": { + "x": 25500, + "y": 25500, + "hp": 18000, + "id": 1 + } + }, + { + "wormholeMessage": { + "x": 25500, + "y": 38500, + "hp": 0, + "id": 2 + } + }, + { + "wormholeMessage": { + "x": 25500, + "y": 39500, + "hp": 0, + "id": 2 + } + }, + { + "wormholeMessage": { + "x": 26500, + "y": 10500, + "hp": 0, + "id": 0 + } + }, + { + "wormholeMessage": { + "x": 26500, + "y": 11500, + "hp": 0, + "id": 0 + } + }, + { + "wormholeMessage": { + "x": 26500, + "y": 24500, + "hp": 18000, + "id": 1 + } + }, + { + "wormholeMessage": { + "x": 26500, + "y": 25500, + "hp": 18000, + "id": 1 + } + }, + { + "wormholeMessage": { + "x": 26500, + "y": 38500, + "hp": 0, + "id": 2 + } + }, + { + "wormholeMessage": { + "x": 26500, + "y": 39500, + "hp": 0, + "id": 2 + } + }, + { + "homeMessage": { + "x": 3500, + "y": 46500, + "hp": 24000, + "teamId": 0 + } + }, + { + "homeMessage": { + "x": 46500, + "y": 3500, + "hp": 24000, + "teamId": 1 + } + }, + { + "teamMessage": { + "teamId": 0, + "playerId": 0, + "score": 21258, + "energy": 21258 + } + }, + { + "teamMessage": { + "teamId": 1, + "playerId": 0, + "score": 21258, + "energy": 21258 + } + } + ], + "gameState": 2, + "allMessage": { + "gameTime": 162610, + "redTeamScore": 21258, + "blueTeamScore": 21258, + "redTeamEnergy": 21258, + "blueTeamEnergy": 21258, + "redHomeHp": 24000, + "blueHomeHp": 24000 + } +} \ No newline at end of file diff --git a/interface/interface_live/Assets/message2.json.meta b/interface/interface_live/Assets/message2.json.meta new file mode 100644 index 00000000..cf435a04 --- /dev/null +++ b/interface/interface_live/Assets/message2.json.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 2fc2d1d251f5e274fb6dc1b28cc79d5e +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/interface/interface_live/ProjectSettings/TagManager.asset b/interface/interface_live/ProjectSettings/TagManager.asset index 1c92a784..e4f446e9 100644 --- a/interface/interface_live/ProjectSettings/TagManager.asset +++ b/interface/interface_live/ProjectSettings/TagManager.asset @@ -3,7 +3,11 @@ --- !u!78 &1 TagManager: serializedVersion: 2 - tags: [] + tags: + - Block + - Base + - Ship + - Bullet layers: - Default - TransparentFX @@ -38,6 +42,9 @@ TagManager: - - m_SortingLayers: + - name: BackGround + uniqueID: 1016154807 + locked: 0 - name: Default uniqueID: 0 locked: 0 From c017d82a6455ab65d8845d5be284ddd440c6fc81 Mon Sep 17 00:00:00 2001 From: 964293341 Date: Wed, 15 May 2024 22:55:56 +0800 Subject: [PATCH 04/11] feat: copy PR #358 --- dependency/proto/Services.proto | 2 + logic/GameClass/GameObj/Areas/Home.cs | 15 ++++++- logic/Gaming/ActionManager.cs | 57 ++++++++++++++++++++++++++- logic/Gaming/Game.cs | 13 +++++- logic/Server/RpcServices.cs | 32 +++++++++++++++ 5 files changed, 115 insertions(+), 4 deletions(-) diff --git a/dependency/proto/Services.proto b/dependency/proto/Services.proto index dbc18505..21c2becb 100755 --- a/dependency/proto/Services.proto +++ b/dependency/proto/Services.proto @@ -17,6 +17,8 @@ service AvailableService rpc Produce(IDMsg) returns (BoolRes); // 开采 rpc Rebuild(ConstructMsg) returns (BoolRes); // 给建筑回血 rpc Construct(ConstructMsg) returns (BoolRes); // 修建建筑 + rpc RepairHome(IDMsg) returns (BoolRes); // 修理大本营 + rpc RepairWormhole(IDMsg) returns (BoolRes); // 修理虫洞 rpc Attack(AttackMsg) returns (BoolRes); // 攻击 rpc Send(SendMsg) returns (BoolRes); // 传递信息 // 大本营 diff --git a/logic/GameClass/GameObj/Areas/Home.cs b/logic/GameClass/GameObj/Areas/Home.cs index 3746ca96..35de2baa 100755 --- a/logic/GameClass/GameObj/Areas/Home.cs +++ b/logic/GameClass/GameObj/Areas/Home.cs @@ -1,6 +1,7 @@ using Preparation.Interface; using Preparation.Utility; using Preparation.Utility.Value; +using Preparation.Utility.Value.SafeValue.Atomic; using Preparation.Utility.Value.SafeValue.LockedValue; namespace GameClass.GameObj.Areas; @@ -12,10 +13,22 @@ public class Home(XY initPos, long id) public InVariableRange HP { get; } = new(GameData.HomeHP); public override bool IsRigid => true; public override ShapeType Shape => ShapeType.Square; - + public AtomicInt RepairNum { get; } = new AtomicInt(0); + public bool Repair(int constructSpeed, Ship ship) + { + return HP.AddVUseOtherRChange(constructSpeed, ship.MoneyPool.Money, 1) > 0; + } public void BeAttacked(Bullet bullet) { if (bullet!.Parent!.TeamID != TeamID) HP.SubPositiveV(bullet.AP); } + public void AddRepairNum(int add = 1) + { + RepairNum.Add(add); + } + public void SubRepairNum(int sub = 1) + { + RepairNum.Sub(sub); + } } diff --git a/logic/Gaming/ActionManager.cs b/logic/Gaming/ActionManager.cs index 8c7cf996..af7b6cb1 100755 --- a/logic/Gaming/ActionManager.cs +++ b/logic/Gaming/ActionManager.cs @@ -240,7 +240,62 @@ public bool Construct(Ship ship, ConstructionType constructionType) { IsBackground = true }.Start(); return false; } - public bool Repair(Ship ship) + public bool RepairHome(Ship ship) + { + Home? home = ((Home?)gameMap.OneForInteract(ship.Position, GameObjType.Home)); + if (home == null) + { + return false; + } + if (home.HP.IsMaxV()) + { + return false; + } + long stateNum = ship.SetShipState(RunningStateType.Waiting, ShipStateType.Constructing); + if (stateNum == -1) + { + return false; + } + new Thread + ( + () => + { + ship.ThreadNum.WaitOne(); + if (!ship.StartThread(stateNum, RunningStateType.RunningActively)) + { + ship.ThreadNum.Release(); + return; + } + home.AddRepairNum(); + Thread.Sleep(GameData.CheckInterval); + new FrameRateTaskExecutor + ( + loopCondition: () => stateNum == ship.StateNum && gameMap.Timer.IsGaming, + loopToDo: () => + { + if (!home.Repair(ship.ConstructSpeed / GameData.NumOfStepPerSecond, ship)) + { + ship.ResetShipState(stateNum); + return false; + } + if (home.HP == home.HP.GetMaxV()) + { + ship.ResetShipState(stateNum); + return false; + } + return true; + }, + timeInterval: GameData.CheckInterval, + finallyReturn: () => 0 + ).Start(); + ship.ThreadNum.Release(); + home.SubRepairNum(); + } + ) + { IsBackground = true }.Start(); + return false; + } + public bool RepairWormhole(Ship ship) { Wormhole? wormhole = ((WormholeCell?)gameMap.OneForInteract(ship.Position, GameObjType.Wormhole))?.Wormhole; if (wormhole == null) diff --git a/logic/Gaming/Game.cs b/logic/Gaming/Game.cs index 7d9f26ca..5ae9c04c 100755 --- a/logic/Gaming/Game.cs +++ b/logic/Gaming/Game.cs @@ -220,13 +220,22 @@ public bool Recycle(long teamID, long shipID) } return false; } - public bool Repair(long teamID, long shipID) + public bool RepairHome(long teamID, long shipID) { if (!gameMap.Timer.IsGaming) return false; Ship? ship = gameMap.FindShipInPlayerID(teamID, shipID); if (ship != null) - return actionManager.Repair(ship); + return actionManager.RepairHome(ship); + return false; + } + public bool RepairWormhole(long teamID, long shipID) + { + if (!gameMap.Timer.IsGaming) + return false; + Ship? ship = gameMap.FindShipInPlayerID(teamID, shipID); + if (ship != null) + return actionManager.RepairWormhole(ship); return false; } public bool Stop(long teamID, long shipID) diff --git a/logic/Server/RpcServices.cs b/logic/Server/RpcServices.cs index 5976e25b..7a7c0863 100755 --- a/logic/Server/RpcServices.cs +++ b/logic/Server/RpcServices.cs @@ -342,6 +342,38 @@ public override Task Construct(ConstructMsg request, ServerCallContext return Task.FromResult(boolRes); } + public override Task RepairHome(IDMsg request, ServerCallContext context) + { + GameServerLogging.logger.ConsoleLogDebug( + $"TRY RepairHome: Player {request.PlayerId} from Team {request.TeamId}"); + BoolRes boolRes = new(); + if (request.PlayerId >= spectatorMinPlayerID) + { + boolRes.ActSuccess = false; + return Task.FromResult(boolRes); + } + // var gameID = communicationToGameID[request.TeamId][request.PlayerId]; + boolRes.ActSuccess = game.RepairHome(request.TeamId, request.PlayerId); + GameServerLogging.logger.ConsoleLogDebug("END RepairHome"); + return Task.FromResult(boolRes); + } + + public override Task RepairWormhole(IDMsg request, ServerCallContext context) + { + GameServerLogging.logger.ConsoleLogDebug( + $"TRY RepairWormhole: Player {request.PlayerId} from Team {request.TeamId}"); + BoolRes boolRes = new(); + if (request.PlayerId >= spectatorMinPlayerID) + { + boolRes.ActSuccess = false; + return Task.FromResult(boolRes); + } + // var gameID = communicationToGameID[request.TeamId][request.PlayerId]; + boolRes.ActSuccess = game.RepairWormhole(request.TeamId, request.PlayerId); + GameServerLogging.logger.ConsoleLogDebug("END RepairWormhole"); + return Task.FromResult(boolRes); + } + public override Task Attack(AttackMsg request, ServerCallContext context) { GameServerLogging.logger.ConsoleLogDebug( From 994522a65673f7c40320c62ac7cf818d79e368c5 Mon Sep 17 00:00:00 2001 From: sigureling <1678348940@qq.com> Date: Thu, 16 May 2024 00:43:01 +0800 Subject: [PATCH 05/11] feat: :zap: Wrap GetConstructionState --- CAPI/cpp/API/include/API.h | 12 ++++++------ CAPI/cpp/API/include/logic.h | 3 ++- CAPI/cpp/API/include/structures.h | 11 +++++++++++ CAPI/cpp/API/src/API.cpp | 9 ++++----- CAPI/cpp/API/src/DebugAPI.cpp | 12 ++++++------ CAPI/cpp/API/src/logic.cpp | 10 +++++----- CAPI/python/PyAPI/API.py | 4 ++-- CAPI/python/PyAPI/DebugAPI.py | 26 +++++++++----------------- CAPI/python/PyAPI/Interface.py | 6 +++--- CAPI/python/PyAPI/logic.py | 19 +++++++++++-------- CAPI/python/PyAPI/structures.py | 5 +++++ 11 files changed, 64 insertions(+), 53 deletions(-) diff --git a/CAPI/cpp/API/include/API.h b/CAPI/cpp/API/include/API.h index 10cc295d..0a82f1ff 100755 --- a/CAPI/cpp/API/include/API.h +++ b/CAPI/cpp/API/include/API.h @@ -45,7 +45,7 @@ class ILogic [[nodiscard]] virtual std::shared_ptr GetGameInfo() const = 0; [[nodiscard]] virtual std::vector GetPlayerGUIDs() const = 0; [[nodiscard]] virtual THUAI7::PlaceType GetPlaceType(int32_t cellX, int32_t cellY) const = 0; - [[nodiscard]] virtual std::pair GetConstructionState(int32_t cellX, int32_t cellY) const = 0; + [[nodiscard]] virtual std::optional GetConstructionState(int32_t cellX, int32_t cellY) const = 0; [[nodiscard]] virtual int32_t GetWormholeHp(int32_t cellX, int32_t cellY) const = 0; [[nodiscard]] virtual int32_t GetResourceState(int32_t cellX, int32_t cellY) const = 0; [[nodiscard]] virtual int32_t GetHomeHp() const = 0; @@ -99,7 +99,7 @@ class IAPI [[nodiscard]] virtual std::vector> GetFullMap() const = 0; [[nodiscard]] virtual std::shared_ptr GetGameInfo() const = 0; [[nodiscard]] virtual THUAI7::PlaceType GetPlaceType(int32_t cellX, int32_t cellY) const = 0; - [[nodiscard]] virtual std::pair GetConstructionState(int32_t cellX, int32_t cellY) const = 0; + [[nodiscard]] virtual std::optional GetConstructionState(int32_t cellX, int32_t cellY) const = 0; [[nodiscard]] virtual int32_t GetWormholeHp(int32_t cellX, int32_t cellY) const = 0; [[nodiscard]] virtual int32_t GetResourceState(int32_t cellX, int32_t cellY) const = 0; [[nodiscard]] virtual int32_t GetHomeHp() const = 0; @@ -209,7 +209,7 @@ class ShipAPI : public IShipAPI, public IGameTimer [[nodiscard]] std::vector> GetBullets() const override; [[nodiscard]] std::vector> GetFullMap() const override; [[nodiscard]] THUAI7::PlaceType GetPlaceType(int32_t cellX, int32_t cellY) const override; - [[nodiscard]] std::pair GetConstructionState(int32_t cellX, int32_t cellY) const override; + [[nodiscard]] std::optional GetConstructionState(int32_t cellX, int32_t cellY) const override; [[nodiscard]] int32_t GetWormholeHp(int32_t x, int32_t y) const override; [[nodiscard]] int32_t GetResourceState(int32_t cellX, int32_t cellY) const override; [[nodiscard]] std::shared_ptr GetGameInfo() const override; @@ -265,7 +265,7 @@ class TeamAPI : public ITeamAPI, public IGameTimer [[nodiscard]] std::vector> GetBullets() const override; [[nodiscard]] std::vector> GetFullMap() const override; [[nodiscard]] THUAI7::PlaceType GetPlaceType(int32_t cellX, int32_t cellY) const override; - [[nodiscard]] std::pair GetConstructionState(int32_t cellX, int32_t cellY) const override; + [[nodiscard]] std::optional GetConstructionState(int32_t cellX, int32_t cellY) const override; [[nodiscard]] int32_t GetWormholeHp(int32_t x, int32_t y) const override; [[nodiscard]] int32_t GetResourceState(int32_t cellX, int32_t cellY) const override; [[nodiscard]] int32_t GetHomeHp() const override; @@ -328,7 +328,7 @@ class ShipDebugAPI : public IShipAPI, public IGameTimer [[nodiscard]] std::vector> GetBullets() const override; [[nodiscard]] std::vector> GetFullMap() const override; [[nodiscard]] THUAI7::PlaceType GetPlaceType(int32_t cellX, int32_t cellY) const override; - [[nodiscard]] std::pair GetConstructionState(int32_t cellX, int32_t cellY) const override; + [[nodiscard]] std::optional GetConstructionState(int32_t cellX, int32_t cellY) const override; [[nodiscard]] int32_t GetWormholeHp(int32_t x, int32_t y) const override; [[nodiscard]] int32_t GetResourceState(int32_t cellX, int32_t cellY) const override; [[nodiscard]] int32_t GetHomeHp() const override; @@ -374,7 +374,7 @@ class TeamDebugAPI : public ITeamAPI, public IGameTimer [[nodiscard]] std::vector> GetBullets() const override; [[nodiscard]] std::vector> GetFullMap() const override; [[nodiscard]] THUAI7::PlaceType GetPlaceType(int32_t cellX, int32_t cellY) const override; - [[nodiscard]] std::pair GetConstructionState(int32_t cellX, int32_t cellY) const override; + [[nodiscard]] std::optional GetConstructionState(int32_t cellX, int32_t cellY) const override; [[nodiscard]] int32_t GetWormholeHp(int32_t x, int32_t y) const override; [[nodiscard]] int32_t GetResourceState(int32_t cellX, int32_t cellY) const override; [[nodiscard]] int32_t GetHomeHp() const override; diff --git a/CAPI/cpp/API/include/logic.h b/CAPI/cpp/API/include/logic.h index a64c8446..93c36f99 100755 --- a/CAPI/cpp/API/include/logic.h +++ b/CAPI/cpp/API/include/logic.h @@ -9,6 +9,7 @@ #include #include +#include #include #include #include @@ -98,7 +99,7 @@ class Logic : public ILogic [[nodiscard]] std::shared_ptr GetGameInfo() const; [[nodiscard]] THUAI7::PlaceType GetPlaceType(int32_t cellX, int32_t cellY) const; [[nodiscard]] std::vector GetPlayerGUIDs() const; - [[nodiscard]] std::pair GetConstructionState(int32_t cellX, int32_t cellY) const; + [[nodiscard]] std::optional GetConstructionState(int32_t cellX, int32_t cellY) const; [[nodiscard]] int32_t GetWormholeHp(int32_t cellX, int32_t cellY) const; [[nodiscard]] int32_t GetResourceState(int32_t cellX, int32_t cellY) const; [[nodiscard]] int32_t GetHomeHp() const; diff --git a/CAPI/cpp/API/include/structures.h b/CAPI/cpp/API/include/structures.h index 35bd5b4f..780fb99f 100755 --- a/CAPI/cpp/API/include/structures.h +++ b/CAPI/cpp/API/include/structures.h @@ -243,6 +243,17 @@ namespace THUAI7 int32_t speed; // 子弹速度 }; + struct Construction + { + int32_t teamID; + int32_t hp; + ConstructionType constructionType; + static Construction newConstruction(std::pair teamHP, ConstructionType type) + { + return Construction{teamHP.first, teamHP.second, type}; + } + }; + // struct BombedBullet // { // BulletType bulletType, diff --git a/CAPI/cpp/API/src/API.cpp b/CAPI/cpp/API/src/API.cpp index 8ede7fd6..41196e57 100755 --- a/CAPI/cpp/API/src/API.cpp +++ b/CAPI/cpp/API/src/API.cpp @@ -1,4 +1,3 @@ -#include #include "AI.h" #include "API.h" @@ -140,14 +139,14 @@ THUAI7::PlaceType TeamAPI::GetPlaceType(int32_t cellX, int32_t cellY) const return logic.GetPlaceType(cellX, cellY); } -std::pair ShipAPI::GetConstructionState(int32_t cellX, int32_t cellY) const +std::optional ShipAPI::GetConstructionState(int32_t cellX, int32_t cellY) const { - return logic.GetConstructionState(cellX, cellY); + return std::move(logic.GetConstructionState(cellX, cellY)); } -std::pair TeamAPI::GetConstructionState(int32_t cellX, int32_t cellY) const +std::optional TeamAPI::GetConstructionState(int32_t cellX, int32_t cellY) const { - return logic.GetConstructionState(cellX, cellY); + return std::move(logic.GetConstructionState(cellX, cellY)); } int32_t ShipAPI::GetWormholeHp(int32_t cellX, int32_t cellY) const diff --git a/CAPI/cpp/API/src/DebugAPI.cpp b/CAPI/cpp/API/src/DebugAPI.cpp index bb9eccf1..4295cf26 100755 --- a/CAPI/cpp/API/src/DebugAPI.cpp +++ b/CAPI/cpp/API/src/DebugAPI.cpp @@ -222,9 +222,9 @@ THUAI7::PlaceType ShipDebugAPI::GetPlaceType(int32_t cellX, int32_t cellY) const return logic.GetPlaceType(cellX, cellY); } -std::pair ShipDebugAPI::GetConstructionState(int32_t cellX, int32_t cellY) const +std::optional ShipDebugAPI::GetConstructionState(int32_t cellX, int32_t cellY) const { - return logic.GetConstructionState(cellX, cellY); + return std::move(logic.GetConstructionState(cellX, cellY)); } int32_t ShipDebugAPI::GetWormholeHp(int32_t cellX, int32_t cellY) const @@ -416,9 +416,9 @@ THUAI7::PlaceType TeamDebugAPI::GetPlaceType(int32_t cellX, int32_t cellY) const return logic.GetPlaceType(cellX, cellY); } -std::pair TeamDebugAPI::GetConstructionState(int32_t cellX, int32_t cellY) const +std::optional TeamDebugAPI::GetConstructionState(int32_t cellX, int32_t cellY) const { - return logic.GetConstructionState(cellX, cellY); + return std::move(logic.GetConstructionState(cellX, cellY)); } int32_t TeamDebugAPI::GetWormholeHp(int32_t cellX, int32_t cellY) const @@ -467,7 +467,7 @@ std::future TeamDebugAPI::InstallModule(int32_t playerID, THUAI7::ModuleTy return std::async(std::launch::async, [=]() { auto result= logic.InstallModule(playerID, moduleType); if(!result) - logger->info("InstallModule: failed at {}ms",Time::TimeSinceStart(startPoint)); + logger->warn("InstallModule: failed at {}ms",Time::TimeSinceStart(startPoint)); return result; }); } @@ -495,7 +495,7 @@ void TeamDebugAPI::PrintSelfInfo() const { auto Team = logic.TeamGetSelfInfo(); logger->info("******Self Info******"); - logger->info("playerID={}, teamID={}, score={}, energy={}", Team->playerID, Team->teamID, Team->score, Team->energy); + logger->info("teamID={}, playerID={}, score={}, energy={}", Team->teamID, Team->playerID, Team->score, Team->energy); logger->info("*********************\n"); } diff --git a/CAPI/cpp/API/src/logic.cpp b/CAPI/cpp/API/src/logic.cpp index 1c73ca58..bc2a522d 100755 --- a/CAPI/cpp/API/src/logic.cpp +++ b/CAPI/cpp/API/src/logic.cpp @@ -91,7 +91,7 @@ THUAI7::PlaceType Logic::GetPlaceType(int32_t cellX, int32_t cellY) const return currentState->gameMap[cellX][cellY]; } -std::pair Logic::GetConstructionState(int32_t cellX, int32_t cellY) const +std::optional Logic::GetConstructionState(int32_t cellX, int32_t cellY) const { std::unique_lock lock(mtxState); logger->debug("Called GetConstructionState"); @@ -101,16 +101,16 @@ std::pair Logic::GetConstructionState(int32_t cellX, int32_t c auto it3 = currentState->mapInfo->fortState.find(pos); if (it != currentState->mapInfo->factoryState.end()) { - return currentState->mapInfo->factoryState[pos]; + return std::make_optional(THUAI7::Construction::newConstruction(currentState->mapInfo->factoryState[pos], THUAI7::ConstructionType::Factory)); } else if (it2 != currentState->mapInfo->communityState.end()) - return currentState->mapInfo->communityState[pos]; + return std::make_optional(THUAI7::Construction::newConstruction(currentState->mapInfo->communityState[pos], THUAI7::ConstructionType::Community)); else if (it3 != currentState->mapInfo->fortState.end()) - return currentState->mapInfo->fortState[pos]; + return std::make_optional(THUAI7::Construction::newConstruction(currentState->mapInfo->fortState[pos], THUAI7::ConstructionType::Fort)); else { logger->warn("Construction not found"); - return std::make_pair(-1, -1); + return std::nullopt; } } diff --git a/CAPI/python/PyAPI/API.py b/CAPI/python/PyAPI/API.py index 176954e9..5b950c5d 100644 --- a/CAPI/python/PyAPI/API.py +++ b/CAPI/python/PyAPI/API.py @@ -82,7 +82,7 @@ def GetFullMap(self) -> List[List[THUAI7.PlaceType]]: def GetPlaceType(self, cellX: int, cellY: int) -> THUAI7.PlaceType: return self.__logic.GetPlaceType(cellX, cellY) - def GetConstructionState(self, cellX: int, cellY: int) -> Tuple[int, int]: + def GetConstructionState(self, cellX: int, cellY: int) -> THUAI7.Construction: return self.__logic.GetConstructionState(cellX, cellY) def GetWormholeHp(self, cellX: int, cellY: int) -> int: @@ -190,7 +190,7 @@ def GetFullMap(self) -> List[List[THUAI7.PlaceType]]: def GetPlaceType(self, cellX: int, cellY: int) -> THUAI7.PlaceType: return self.__logic.GetPlaceType(cellX, cellY) - def GetConstructionState(self, cellX: int, cellY: int) -> Tuple[int, int]: + def GetConstructionState(self, cellX: int, cellY: int) -> THUAI7.Construction: return self.__logic.GetConstructionState(cellX, cellY) def GetWormholeHp(self, cellX: int, cellY: int) -> int: diff --git a/CAPI/python/PyAPI/DebugAPI.py b/CAPI/python/PyAPI/DebugAPI.py index 536714c9..8a02d3df 100644 --- a/CAPI/python/PyAPI/DebugAPI.py +++ b/CAPI/python/PyAPI/DebugAPI.py @@ -227,7 +227,7 @@ def GetFullMap(self) -> List[List[THUAI7.PlaceType]]: def GetPlaceType(self, cellX: int, cellY: int) -> THUAI7.PlaceType: return self.__logic.GetPlaceType(cellX, cellY) - def GetConstructionState(self, cellX: int, cellY: int) -> Tuple[int, int]: + def GetConstructionState(self, cellX: int, cellY: int) -> THUAI7.Construction: return self.__logic.GetConstructionState(cellX, cellY) def GetWormholeHp(self, cellX: int, cellY: int) -> int: @@ -291,23 +291,14 @@ def PrintTeam(self) -> None: def PrintSelfInfo(self) -> None: ship = self.__logic.GetSelfInfo() - self.__logger.info("******ship Info******") + self.__logger.info("******Self Info******") self.__logger.info( - f"teamID={ship.teamID} playerID={ship.playerID}, GUID={ship.guid} shipType:{ship.shipType}" + f"type={THUAI7.shipTypeDict[ship.shipType]}, playerID={ship.playerID}, GUID={ship.guid}, x={ship.x}, y={ship.y}" ) self.__logger.info( - f"x={ship.x}, y={ship.y} hp={ship.hp} armor={ship.armor} shield={ship.shield} state:{ship.shipState}" + f"state={THUAI7.shipStateDict[ship.shipState]}, speed={ship.speed}, view range={ship.viewRange}, facing direction={ship.facingDirection}" ) - self.__logger.info( - f"speed={ship.speed}, view range={ship.viewRange}, facingDirection={ship.facingDirection}" - ) - self.__logger.info( - f"producerType:{ship.producerType} constructorType:{ship.constructorType}" - ) - self.__logger.info( - f"armorType:{ship.armorType} shieldType:{ship.shieldType} weaponType:{ship.weaponType}" - ) - self.__logger.info("************************\n") + self.__logger.info("*********************\n") def __GetTime(self) -> float: return (datetime.datetime.now() - self.__startPoint) / datetime.timedelta( @@ -474,7 +465,7 @@ def GetFullMap(self) -> List[List[THUAI7.PlaceType]]: def GetPlaceType(self, cellX: int, cellY: int) -> THUAI7.PlaceType: return self.__logic.GetPlaceType(cellX, cellY) - def GetConstructionState(self, cellX: int, cellY: int) -> Tuple[int, int]: + def GetConstructionState(self, cellX: int, cellY: int) -> THUAI7.Construction: return self.__logic.GetConstructionState(cellX, cellY) def GetWormholeHp(self, cellX: int, cellY: int) -> int: @@ -530,8 +521,9 @@ def PrintTeam(self) -> None: def PrintSelfInfo(self) -> None: selfInfo = self.__logic.GetSelfInfo() self.__logger.info("******self team info******") - self.__logger.info(f"teamID:{selfInfo.teamID} playerID:{selfInfo.playerID}") - self.__logger.info(f"score:{selfInfo.score} energy:{selfInfo.energy}") + self.__logger.info( + f"teamID:{selfInfo.teamID} playerID:{selfInfo.playerID} score:{selfInfo.score} energy:{selfInfo.energy}" + ) self.__logger.info("************************\n") def __GetTime(self) -> float: diff --git a/CAPI/python/PyAPI/Interface.py b/CAPI/python/PyAPI/Interface.py index 3cac021a..b41c2dbd 100644 --- a/CAPI/python/PyAPI/Interface.py +++ b/CAPI/python/PyAPI/Interface.py @@ -43,7 +43,7 @@ def GetPlaceType(self, cellX: int, cellY: int) -> THUAI7.PlaceType: pass @abstractmethod - def GetConstructionState(self, cellX: int, cellY: int) -> tuple: + def GetConstructionState(self, cellX: int, cellY: int) -> THUAI7.Construction: pass @abstractmethod @@ -247,12 +247,12 @@ def GetPlaceType(self, cellX: int, cellY: int) -> THUAI7.PlaceType: pass @abstractmethod - def GetConstructionState(self, cellX: int, cellY: int) -> Tuple[int, int]: + def GetConstructionState(self, cellX: int, cellY: int) -> THUAI7.Construction: """获取当前建筑状态 :param cellX: X坐标, 单位Cell :param cellY: Y坐标, 单位Cell - :return: 该建筑当前的所属队伍编号与血量 + :return: 该建筑信息 """ pass diff --git a/CAPI/python/PyAPI/logic.py b/CAPI/python/PyAPI/logic.py index d0260440..36934ae7 100644 --- a/CAPI/python/PyAPI/logic.py +++ b/CAPI/python/PyAPI/logic.py @@ -138,24 +138,27 @@ def GetPlayerGUIDs(self) -> List[int]: with self.__mtxState: return copy.deepcopy(self.__currentState.guids) - def GetConstructionState(self, cellX: int, cellY: int) -> tuple: + def GetConstructionState(self, cellX: int, cellY: int) -> THUAI7.Construction: with self.__mtxState: self.__logger.debug("Called GetConstructionState") if (cellX, cellY) in self.__currentState.mapInfo.factoryState: - return copy.deepcopy( - self.__currentState.mapInfo.factoryState[(cellX, cellY)] + return THUAI7.Construction( + self.__currentState.mapInfo.factoryState[(cellX, cellY)], + THUAI7.ConstructionType.Factory, ) elif (cellX, cellY) in self.__currentState.mapInfo.communityState: - return copy.deepcopy( - self.__currentState.mapInfo.communityState[(cellX, cellY)] + return THUAI7.Construction( + self.__currentState.mapInfo.communityState[(cellX, cellY)], + THUAI7.ConstructionType.Community, ) elif (cellX, cellY) in self.__currentState.mapInfo.fortState: - return copy.deepcopy( - self.__currentState.mapInfo.fortState[(cellX, cellY)] + return THUAI7.Construction( + self.__currentState.mapInfo.fortState[(cellX, cellY)], + THUAI7.ConstructionType.Fort, ) else: self.__logger.warning("GetConstructionState: Out of range") - return (-1, -1) + return None def GetWormholeHp(self, cellX: int, cellY: int) -> int: with self.__mtxState: diff --git a/CAPI/python/PyAPI/structures.py b/CAPI/python/PyAPI/structures.py index 7e261c05..54612465 100644 --- a/CAPI/python/PyAPI/structures.py +++ b/CAPI/python/PyAPI/structures.py @@ -227,6 +227,11 @@ def __init__(self): self.teamID: int = 0 self.guid: int = 0 +class Construction: + def __init__(self,teamID,HP,type:ConstructionType): + self.teamID=teamID + self.hp=HP + self.constructionType=type class Bullet: """ From 112d3b5d4e03f73b3b8307622ca8becd422c8b11 Mon Sep 17 00:00:00 2001 From: sigureling <1678348940@qq.com> Date: Thu, 16 May 2024 00:48:42 +0800 Subject: [PATCH 06/11] fix: :fire: remove useless code --- dependency/proto/Services.proto | 2 -- 1 file changed, 2 deletions(-) diff --git a/dependency/proto/Services.proto b/dependency/proto/Services.proto index 66a1ee26..794af9f4 100755 --- a/dependency/proto/Services.proto +++ b/dependency/proto/Services.proto @@ -21,8 +21,6 @@ service AvailableService rpc RepairWormhole(IDMsg) returns (BoolRes); // 修理虫洞 rpc Attack(AttackMsg) returns (BoolRes); // 攻击 rpc Send(SendMsg) returns (BoolRes); // 传递信息 - rpc RepairHome(IDMsg) returns (BoolRes); // 修理大本营 - rpc RepairWormhole(IDMsg) returns (BoolRes); // 修理虫洞 // 大本营 rpc InstallModule(InstallMsg) returns (BoolRes); From 2381af5e14bf8763d036eadfb5de284c24e03380 Mon Sep 17 00:00:00 2001 From: sigureling <1678348940@qq.com> Date: Thu, 16 May 2024 00:59:10 +0800 Subject: [PATCH 07/11] style: :art: Rename ConstructionState --- CAPI/cpp/API/include/API.h | 12 ++++++------ CAPI/cpp/API/include/logic.h | 2 +- CAPI/cpp/API/include/structures.h | 8 +++++--- CAPI/cpp/API/src/API.cpp | 4 ++-- CAPI/cpp/API/src/DebugAPI.cpp | 4 ++-- CAPI/cpp/API/src/logic.cpp | 8 ++++---- 6 files changed, 20 insertions(+), 18 deletions(-) diff --git a/CAPI/cpp/API/include/API.h b/CAPI/cpp/API/include/API.h index 0a82f1ff..9b2a41e9 100755 --- a/CAPI/cpp/API/include/API.h +++ b/CAPI/cpp/API/include/API.h @@ -45,7 +45,7 @@ class ILogic [[nodiscard]] virtual std::shared_ptr GetGameInfo() const = 0; [[nodiscard]] virtual std::vector GetPlayerGUIDs() const = 0; [[nodiscard]] virtual THUAI7::PlaceType GetPlaceType(int32_t cellX, int32_t cellY) const = 0; - [[nodiscard]] virtual std::optional GetConstructionState(int32_t cellX, int32_t cellY) const = 0; + [[nodiscard]] virtual std::optional GetConstructionState(int32_t cellX, int32_t cellY) const = 0; [[nodiscard]] virtual int32_t GetWormholeHp(int32_t cellX, int32_t cellY) const = 0; [[nodiscard]] virtual int32_t GetResourceState(int32_t cellX, int32_t cellY) const = 0; [[nodiscard]] virtual int32_t GetHomeHp() const = 0; @@ -99,7 +99,7 @@ class IAPI [[nodiscard]] virtual std::vector> GetFullMap() const = 0; [[nodiscard]] virtual std::shared_ptr GetGameInfo() const = 0; [[nodiscard]] virtual THUAI7::PlaceType GetPlaceType(int32_t cellX, int32_t cellY) const = 0; - [[nodiscard]] virtual std::optional GetConstructionState(int32_t cellX, int32_t cellY) const = 0; + [[nodiscard]] virtual std::optional GetConstructionState(int32_t cellX, int32_t cellY) const = 0; [[nodiscard]] virtual int32_t GetWormholeHp(int32_t cellX, int32_t cellY) const = 0; [[nodiscard]] virtual int32_t GetResourceState(int32_t cellX, int32_t cellY) const = 0; [[nodiscard]] virtual int32_t GetHomeHp() const = 0; @@ -209,7 +209,7 @@ class ShipAPI : public IShipAPI, public IGameTimer [[nodiscard]] std::vector> GetBullets() const override; [[nodiscard]] std::vector> GetFullMap() const override; [[nodiscard]] THUAI7::PlaceType GetPlaceType(int32_t cellX, int32_t cellY) const override; - [[nodiscard]] std::optional GetConstructionState(int32_t cellX, int32_t cellY) const override; + [[nodiscard]] std::optional GetConstructionState(int32_t cellX, int32_t cellY) const override; [[nodiscard]] int32_t GetWormholeHp(int32_t x, int32_t y) const override; [[nodiscard]] int32_t GetResourceState(int32_t cellX, int32_t cellY) const override; [[nodiscard]] std::shared_ptr GetGameInfo() const override; @@ -265,7 +265,7 @@ class TeamAPI : public ITeamAPI, public IGameTimer [[nodiscard]] std::vector> GetBullets() const override; [[nodiscard]] std::vector> GetFullMap() const override; [[nodiscard]] THUAI7::PlaceType GetPlaceType(int32_t cellX, int32_t cellY) const override; - [[nodiscard]] std::optional GetConstructionState(int32_t cellX, int32_t cellY) const override; + [[nodiscard]] std::optional GetConstructionState(int32_t cellX, int32_t cellY) const override; [[nodiscard]] int32_t GetWormholeHp(int32_t x, int32_t y) const override; [[nodiscard]] int32_t GetResourceState(int32_t cellX, int32_t cellY) const override; [[nodiscard]] int32_t GetHomeHp() const override; @@ -328,7 +328,7 @@ class ShipDebugAPI : public IShipAPI, public IGameTimer [[nodiscard]] std::vector> GetBullets() const override; [[nodiscard]] std::vector> GetFullMap() const override; [[nodiscard]] THUAI7::PlaceType GetPlaceType(int32_t cellX, int32_t cellY) const override; - [[nodiscard]] std::optional GetConstructionState(int32_t cellX, int32_t cellY) const override; + [[nodiscard]] std::optional GetConstructionState(int32_t cellX, int32_t cellY) const override; [[nodiscard]] int32_t GetWormholeHp(int32_t x, int32_t y) const override; [[nodiscard]] int32_t GetResourceState(int32_t cellX, int32_t cellY) const override; [[nodiscard]] int32_t GetHomeHp() const override; @@ -374,7 +374,7 @@ class TeamDebugAPI : public ITeamAPI, public IGameTimer [[nodiscard]] std::vector> GetBullets() const override; [[nodiscard]] std::vector> GetFullMap() const override; [[nodiscard]] THUAI7::PlaceType GetPlaceType(int32_t cellX, int32_t cellY) const override; - [[nodiscard]] std::optional GetConstructionState(int32_t cellX, int32_t cellY) const override; + [[nodiscard]] std::optional GetConstructionState(int32_t cellX, int32_t cellY) const override; [[nodiscard]] int32_t GetWormholeHp(int32_t x, int32_t y) const override; [[nodiscard]] int32_t GetResourceState(int32_t cellX, int32_t cellY) const override; [[nodiscard]] int32_t GetHomeHp() const override; diff --git a/CAPI/cpp/API/include/logic.h b/CAPI/cpp/API/include/logic.h index 93c36f99..e03bad4e 100755 --- a/CAPI/cpp/API/include/logic.h +++ b/CAPI/cpp/API/include/logic.h @@ -99,7 +99,7 @@ class Logic : public ILogic [[nodiscard]] std::shared_ptr GetGameInfo() const; [[nodiscard]] THUAI7::PlaceType GetPlaceType(int32_t cellX, int32_t cellY) const; [[nodiscard]] std::vector GetPlayerGUIDs() const; - [[nodiscard]] std::optional GetConstructionState(int32_t cellX, int32_t cellY) const; + [[nodiscard]] std::optional GetConstructionState(int32_t cellX, int32_t cellY) const; [[nodiscard]] int32_t GetWormholeHp(int32_t cellX, int32_t cellY) const; [[nodiscard]] int32_t GetResourceState(int32_t cellX, int32_t cellY) const; [[nodiscard]] int32_t GetHomeHp() const; diff --git a/CAPI/cpp/API/include/structures.h b/CAPI/cpp/API/include/structures.h index 780fb99f..375c57e1 100755 --- a/CAPI/cpp/API/include/structures.h +++ b/CAPI/cpp/API/include/structures.h @@ -243,14 +243,16 @@ namespace THUAI7 int32_t speed; // 子弹速度 }; - struct Construction + struct ConstructionState { int32_t teamID; int32_t hp; ConstructionType constructionType; - static Construction newConstruction(std::pair teamHP, ConstructionType type) + ConstructionState(std::pair teamHP, ConstructionType type) : + teamID(teamHP.first), + hp(teamHP.second), + constructionType(type) { - return Construction{teamHP.first, teamHP.second, type}; } }; diff --git a/CAPI/cpp/API/src/API.cpp b/CAPI/cpp/API/src/API.cpp index 41196e57..6b9fbc2a 100755 --- a/CAPI/cpp/API/src/API.cpp +++ b/CAPI/cpp/API/src/API.cpp @@ -139,12 +139,12 @@ THUAI7::PlaceType TeamAPI::GetPlaceType(int32_t cellX, int32_t cellY) const return logic.GetPlaceType(cellX, cellY); } -std::optional ShipAPI::GetConstructionState(int32_t cellX, int32_t cellY) const +std::optional ShipAPI::GetConstructionState(int32_t cellX, int32_t cellY) const { return std::move(logic.GetConstructionState(cellX, cellY)); } -std::optional TeamAPI::GetConstructionState(int32_t cellX, int32_t cellY) const +std::optional TeamAPI::GetConstructionState(int32_t cellX, int32_t cellY) const { return std::move(logic.GetConstructionState(cellX, cellY)); } diff --git a/CAPI/cpp/API/src/DebugAPI.cpp b/CAPI/cpp/API/src/DebugAPI.cpp index 4295cf26..6b308761 100755 --- a/CAPI/cpp/API/src/DebugAPI.cpp +++ b/CAPI/cpp/API/src/DebugAPI.cpp @@ -222,7 +222,7 @@ THUAI7::PlaceType ShipDebugAPI::GetPlaceType(int32_t cellX, int32_t cellY) const return logic.GetPlaceType(cellX, cellY); } -std::optional ShipDebugAPI::GetConstructionState(int32_t cellX, int32_t cellY) const +std::optional ShipDebugAPI::GetConstructionState(int32_t cellX, int32_t cellY) const { return std::move(logic.GetConstructionState(cellX, cellY)); } @@ -416,7 +416,7 @@ THUAI7::PlaceType TeamDebugAPI::GetPlaceType(int32_t cellX, int32_t cellY) const return logic.GetPlaceType(cellX, cellY); } -std::optional TeamDebugAPI::GetConstructionState(int32_t cellX, int32_t cellY) const +std::optional TeamDebugAPI::GetConstructionState(int32_t cellX, int32_t cellY) const { return std::move(logic.GetConstructionState(cellX, cellY)); } diff --git a/CAPI/cpp/API/src/logic.cpp b/CAPI/cpp/API/src/logic.cpp index bc2a522d..f7f0faeb 100755 --- a/CAPI/cpp/API/src/logic.cpp +++ b/CAPI/cpp/API/src/logic.cpp @@ -91,7 +91,7 @@ THUAI7::PlaceType Logic::GetPlaceType(int32_t cellX, int32_t cellY) const return currentState->gameMap[cellX][cellY]; } -std::optional Logic::GetConstructionState(int32_t cellX, int32_t cellY) const +std::optional Logic::GetConstructionState(int32_t cellX, int32_t cellY) const { std::unique_lock lock(mtxState); logger->debug("Called GetConstructionState"); @@ -101,12 +101,12 @@ std::optional Logic::GetConstructionState(int32_t cellX, i auto it3 = currentState->mapInfo->fortState.find(pos); if (it != currentState->mapInfo->factoryState.end()) { - return std::make_optional(THUAI7::Construction::newConstruction(currentState->mapInfo->factoryState[pos], THUAI7::ConstructionType::Factory)); + return std::make_optional(THUAI7::ConstructionState(currentState->mapInfo->factoryState[pos], THUAI7::ConstructionType::Factory)); } else if (it2 != currentState->mapInfo->communityState.end()) - return std::make_optional(THUAI7::Construction::newConstruction(currentState->mapInfo->communityState[pos], THUAI7::ConstructionType::Community)); + return std::make_optional(THUAI7::ConstructionState(currentState->mapInfo->communityState[pos], THUAI7::ConstructionType::Community)); else if (it3 != currentState->mapInfo->fortState.end()) - return std::make_optional(THUAI7::Construction::newConstruction(currentState->mapInfo->fortState[pos], THUAI7::ConstructionType::Fort)); + return std::make_optional(THUAI7::ConstructionState(currentState->mapInfo->fortState[pos], THUAI7::ConstructionType::Fort)); else { logger->warn("Construction not found"); From 281a465ba7bac6f3897bc62d311fcb774ae5eafc Mon Sep 17 00:00:00 2001 From: sigureling <1678348940@qq.com> Date: Thu, 16 May 2024 01:05:18 +0800 Subject: [PATCH 08/11] fix: :fire: remove useless code --- logic/Server/RpcServices.cs | 32 -------------------------------- 1 file changed, 32 deletions(-) diff --git a/logic/Server/RpcServices.cs b/logic/Server/RpcServices.cs index d9892c7a..7a7c0863 100755 --- a/logic/Server/RpcServices.cs +++ b/logic/Server/RpcServices.cs @@ -306,38 +306,6 @@ public override Task Produce(IDMsg request, ServerCallContext context) return Task.FromResult(boolRes); } - public override Task RepairHome(IDMsg request, ServerCallContext context) - { - GameServerLogging.logger.ConsoleLogDebug( - $"TRY RepairHome: Player {request.PlayerId} from Team {request.TeamId}"); - BoolRes boolRes = new(); - if (request.PlayerId >= spectatorMinPlayerID) - { - boolRes.ActSuccess = false; - return Task.FromResult(boolRes); - } - // var gameID = communicationToGameID[request.TeamId][request.PlayerId]; - boolRes.ActSuccess = game.RepairHome(request.TeamId, request.PlayerId); - GameServerLogging.logger.ConsoleLogDebug("END RepairHome"); - return Task.FromResult(boolRes); - } - - public override Task RepairWormhole(IDMsg request, ServerCallContext context) - { - GameServerLogging.logger.ConsoleLogDebug( - $"TRY RepairWormhole: Player {request.PlayerId} from Team {request.TeamId}"); - BoolRes boolRes = new(); - if (request.PlayerId >= spectatorMinPlayerID) - { - boolRes.ActSuccess = false; - return Task.FromResult(boolRes); - } - // var gameID = communicationToGameID[request.TeamId][request.PlayerId]; - boolRes.ActSuccess = game.RepairWormhole(request.TeamId, request.PlayerId); - GameServerLogging.logger.ConsoleLogDebug("END RepairWormhole"); - return Task.FromResult(boolRes); - } - public override Task Rebuild(ConstructMsg request, ServerCallContext context) { GameServerLogging.logger.ConsoleLogDebug( From ae341bf56bdfd7368a09c5a7c5ebd5739453cd25 Mon Sep 17 00:00:00 2001 From: sigureling <1678348940@qq.com> Date: Thu, 16 May 2024 17:06:15 +0800 Subject: [PATCH 09/11] perf: :fire: remove std::move --- CAPI/cpp/API/src/API.cpp | 4 ++-- CAPI/cpp/API/src/DebugAPI.cpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/CAPI/cpp/API/src/API.cpp b/CAPI/cpp/API/src/API.cpp index 6b9fbc2a..9656d2ec 100755 --- a/CAPI/cpp/API/src/API.cpp +++ b/CAPI/cpp/API/src/API.cpp @@ -141,12 +141,12 @@ THUAI7::PlaceType TeamAPI::GetPlaceType(int32_t cellX, int32_t cellY) const std::optional ShipAPI::GetConstructionState(int32_t cellX, int32_t cellY) const { - return std::move(logic.GetConstructionState(cellX, cellY)); + return logic.GetConstructionState(cellX, cellY); } std::optional TeamAPI::GetConstructionState(int32_t cellX, int32_t cellY) const { - return std::move(logic.GetConstructionState(cellX, cellY)); + return logic.GetConstructionState(cellX, cellY); } int32_t ShipAPI::GetWormholeHp(int32_t cellX, int32_t cellY) const diff --git a/CAPI/cpp/API/src/DebugAPI.cpp b/CAPI/cpp/API/src/DebugAPI.cpp index 6b308761..4e24fd50 100755 --- a/CAPI/cpp/API/src/DebugAPI.cpp +++ b/CAPI/cpp/API/src/DebugAPI.cpp @@ -224,7 +224,7 @@ THUAI7::PlaceType ShipDebugAPI::GetPlaceType(int32_t cellX, int32_t cellY) const std::optional ShipDebugAPI::GetConstructionState(int32_t cellX, int32_t cellY) const { - return std::move(logic.GetConstructionState(cellX, cellY)); + return logic.GetConstructionState(cellX, cellY); } int32_t ShipDebugAPI::GetWormholeHp(int32_t cellX, int32_t cellY) const @@ -418,7 +418,7 @@ THUAI7::PlaceType TeamDebugAPI::GetPlaceType(int32_t cellX, int32_t cellY) const std::optional TeamDebugAPI::GetConstructionState(int32_t cellX, int32_t cellY) const { - return std::move(logic.GetConstructionState(cellX, cellY)); + return logic.GetConstructionState(cellX, cellY); } int32_t TeamDebugAPI::GetWormholeHp(int32_t cellX, int32_t cellY) const From d2c5e5557713b7336f6b3815cfd9e170325d5f0e Mon Sep 17 00:00:00 2001 From: sigureling <1678348940@qq.com> Date: Thu, 16 May 2024 17:07:11 +0800 Subject: [PATCH 10/11] perf: :fire: remove spare construct function --- CAPI/cpp/API/src/logic.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/CAPI/cpp/API/src/logic.cpp b/CAPI/cpp/API/src/logic.cpp index f7f0faeb..9710b355 100755 --- a/CAPI/cpp/API/src/logic.cpp +++ b/CAPI/cpp/API/src/logic.cpp @@ -101,12 +101,12 @@ std::optional Logic::GetConstructionState(int32_t cel auto it3 = currentState->mapInfo->fortState.find(pos); if (it != currentState->mapInfo->factoryState.end()) { - return std::make_optional(THUAI7::ConstructionState(currentState->mapInfo->factoryState[pos], THUAI7::ConstructionType::Factory)); + return std::make_optional(currentState->mapInfo->factoryState[pos], THUAI7::ConstructionType::Factory); } else if (it2 != currentState->mapInfo->communityState.end()) - return std::make_optional(THUAI7::ConstructionState(currentState->mapInfo->communityState[pos], THUAI7::ConstructionType::Community)); + return std::make_optional(currentState->mapInfo->communityState[pos], THUAI7::ConstructionType::Community); else if (it3 != currentState->mapInfo->fortState.end()) - return std::make_optional(THUAI7::ConstructionState(currentState->mapInfo->fortState[pos], THUAI7::ConstructionType::Fort)); + return std::make_optional(currentState->mapInfo->fortState[pos], THUAI7::ConstructionType::Fort); else { logger->warn("Construction not found"); From b73242a375447273f97511f47de0c5dc5989c0a1 Mon Sep 17 00:00:00 2001 From: sigureling <1678348940@qq.com> Date: Thu, 16 May 2024 17:10:53 +0800 Subject: [PATCH 11/11] style: :art: change to THUAI7.ConstructionState | None --- CAPI/python/PyAPI/API.py | 4 ++-- CAPI/python/PyAPI/DebugAPI.py | 4 ++-- CAPI/python/PyAPI/Interface.py | 6 +++--- CAPI/python/PyAPI/logic.py | 8 ++++---- CAPI/python/PyAPI/structures.py | 2 +- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/CAPI/python/PyAPI/API.py b/CAPI/python/PyAPI/API.py index 5b950c5d..70eb0950 100644 --- a/CAPI/python/PyAPI/API.py +++ b/CAPI/python/PyAPI/API.py @@ -82,7 +82,7 @@ def GetFullMap(self) -> List[List[THUAI7.PlaceType]]: def GetPlaceType(self, cellX: int, cellY: int) -> THUAI7.PlaceType: return self.__logic.GetPlaceType(cellX, cellY) - def GetConstructionState(self, cellX: int, cellY: int) -> THUAI7.Construction: + def GetConstructionState(self, cellX: int, cellY: int) -> THUAI7.ConstructionState | None: return self.__logic.GetConstructionState(cellX, cellY) def GetWormholeHp(self, cellX: int, cellY: int) -> int: @@ -190,7 +190,7 @@ def GetFullMap(self) -> List[List[THUAI7.PlaceType]]: def GetPlaceType(self, cellX: int, cellY: int) -> THUAI7.PlaceType: return self.__logic.GetPlaceType(cellX, cellY) - def GetConstructionState(self, cellX: int, cellY: int) -> THUAI7.Construction: + def GetConstructionState(self, cellX: int, cellY: int) -> THUAI7.ConstructionState | None: return self.__logic.GetConstructionState(cellX, cellY) def GetWormholeHp(self, cellX: int, cellY: int) -> int: diff --git a/CAPI/python/PyAPI/DebugAPI.py b/CAPI/python/PyAPI/DebugAPI.py index 8a02d3df..25f6f66c 100644 --- a/CAPI/python/PyAPI/DebugAPI.py +++ b/CAPI/python/PyAPI/DebugAPI.py @@ -227,7 +227,7 @@ def GetFullMap(self) -> List[List[THUAI7.PlaceType]]: def GetPlaceType(self, cellX: int, cellY: int) -> THUAI7.PlaceType: return self.__logic.GetPlaceType(cellX, cellY) - def GetConstructionState(self, cellX: int, cellY: int) -> THUAI7.Construction: + def GetConstructionState(self, cellX: int, cellY: int) -> THUAI7.ConstructionState | None: return self.__logic.GetConstructionState(cellX, cellY) def GetWormholeHp(self, cellX: int, cellY: int) -> int: @@ -465,7 +465,7 @@ def GetFullMap(self) -> List[List[THUAI7.PlaceType]]: def GetPlaceType(self, cellX: int, cellY: int) -> THUAI7.PlaceType: return self.__logic.GetPlaceType(cellX, cellY) - def GetConstructionState(self, cellX: int, cellY: int) -> THUAI7.Construction: + def GetConstructionState(self, cellX: int, cellY: int) -> THUAI7.ConstructionState | None: return self.__logic.GetConstructionState(cellX, cellY) def GetWormholeHp(self, cellX: int, cellY: int) -> int: diff --git a/CAPI/python/PyAPI/Interface.py b/CAPI/python/PyAPI/Interface.py index b41c2dbd..6e374797 100644 --- a/CAPI/python/PyAPI/Interface.py +++ b/CAPI/python/PyAPI/Interface.py @@ -43,7 +43,7 @@ def GetPlaceType(self, cellX: int, cellY: int) -> THUAI7.PlaceType: pass @abstractmethod - def GetConstructionState(self, cellX: int, cellY: int) -> THUAI7.Construction: + def GetConstructionState(self, cellX: int, cellY: int) -> THUAI7.ConstructionState | None: pass @abstractmethod @@ -247,7 +247,7 @@ def GetPlaceType(self, cellX: int, cellY: int) -> THUAI7.PlaceType: pass @abstractmethod - def GetConstructionState(self, cellX: int, cellY: int) -> THUAI7.Construction: + def GetConstructionState(self, cellX: int, cellY: int) -> THUAI7.ConstructionState | None: """获取当前建筑状态 :param cellX: X坐标, 单位Cell @@ -415,7 +415,7 @@ def Produce(self) -> Future[bool]: pass @abstractmethod - def Rebuild(self, constructionType: THUAI7.ConstructionType) -> Future[bool]: + def Rebuild(self, constructionType: THUAI7.ConstructionStateType) -> Future[bool]: """发出重建指令 - 需要接近待重建 `Construction` diff --git a/CAPI/python/PyAPI/logic.py b/CAPI/python/PyAPI/logic.py index 36934ae7..bb4e1dae 100644 --- a/CAPI/python/PyAPI/logic.py +++ b/CAPI/python/PyAPI/logic.py @@ -138,21 +138,21 @@ def GetPlayerGUIDs(self) -> List[int]: with self.__mtxState: return copy.deepcopy(self.__currentState.guids) - def GetConstructionState(self, cellX: int, cellY: int) -> THUAI7.Construction: + def GetConstructionState(self, cellX: int, cellY: int) -> THUAI7.ConstructionState | None: with self.__mtxState: self.__logger.debug("Called GetConstructionState") if (cellX, cellY) in self.__currentState.mapInfo.factoryState: - return THUAI7.Construction( + return THUAI7.ConstructionState( self.__currentState.mapInfo.factoryState[(cellX, cellY)], THUAI7.ConstructionType.Factory, ) elif (cellX, cellY) in self.__currentState.mapInfo.communityState: - return THUAI7.Construction( + return THUAI7.ConstructionState( self.__currentState.mapInfo.communityState[(cellX, cellY)], THUAI7.ConstructionType.Community, ) elif (cellX, cellY) in self.__currentState.mapInfo.fortState: - return THUAI7.Construction( + return THUAI7.ConstructionState( self.__currentState.mapInfo.fortState[(cellX, cellY)], THUAI7.ConstructionType.Fort, ) diff --git a/CAPI/python/PyAPI/structures.py b/CAPI/python/PyAPI/structures.py index 54612465..59b02fd8 100644 --- a/CAPI/python/PyAPI/structures.py +++ b/CAPI/python/PyAPI/structures.py @@ -227,7 +227,7 @@ def __init__(self): self.teamID: int = 0 self.guid: int = 0 -class Construction: +class ConstructionState: def __init__(self,teamID,HP,type:ConstructionType): self.teamID=teamID self.hp=HP