zxl
/
Frame
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

123

ChangeToNet
zxl 2024-05-06 18:04:53 +08:00
parent 96df680a97
commit ca3cd182d3
6 changed files with 11 additions and 171 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

109
.idea/.idea.TestF/.idea/workspace.xml
View File

@ -5,87 +5,12 @@
</component>
<component name="ChangeListManager">
<list default="true" id="d018256f-8250-4025-b60e-7cdf03f0e7e0" name="Changes" comment="">
<change afterPath="$PROJECT_DIR$/Assets/Scripts/UI/UILogic/GlobalStrongTipsUI.cs" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/.idea.TestF/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/.idea.TestF/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/GameRes/Prefabs/Room/伏龙阁.prefab" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/GameRes/Prefabs/Room/伏龙阁.prefab" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/GameRes/Prefabs/Room/先祖大厅.prefab" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/GameRes/Prefabs/Room/先祖大厅.prefab" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/GameRes/Prefabs/Room/圣龙残骸.prefab" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/GameRes/Prefabs/Room/圣龙残骸.prefab" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/GameRes/Prefabs/Room/天池遗址.prefab" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/GameRes/Prefabs/Room/天池遗址.prefab" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/GameRes/Prefabs/Room/杂物室.prefab" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/GameRes/Prefabs/Room/杂物室.prefab" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/GameRes/Prefabs/Room/沙慕龙阁.prefab" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/GameRes/Prefabs/Room/沙慕龙阁.prefab" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/GameRes/Prefabs/Room/英雄圣殿.prefab" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/GameRes/Prefabs/Room/英雄圣殿.prefab" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/GameRes/Prefabs/Room/训练堂.prefab" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/GameRes/Prefabs/Room/训练堂.prefab" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/GameRes/Prefabs/UI/GlobalTipsUI.prefab" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/GameRes/Prefabs/UI/GlobalTipsUI.prefab.meta" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/Scenes/Init.unity" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Scenes/Init.unity" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/Scripts/AssetConstPath/AssetPathConst.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Scripts/AssetConstPath/AssetPathConst.cs" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/Scripts/Data/Response/S2C_Balance.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Scripts/Data/Response/S2C_Balance.cs" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/Scripts/Dinosaurs/Boss/IBossManager.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Scripts/Dinosaurs/Boss/IBossManager.cs" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/Scripts/Dinosaurs/DinosaursGameManager.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Scripts/Dinosaurs/DinosaursGameManager.cs" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/Scripts/Dinosaurs/Room/RoomInfo.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Scripts/Dinosaurs/Room/RoomInfo.cs" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/Scripts/Game.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Scripts/Game.cs" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/Scripts/Helper/CommonHelper.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Scripts/Helper/CommonHelper.cs" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/Scripts/Log/Log.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Scripts/Log/Log.cs" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/Scripts/Network/SocketManager.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Scripts/Network/SocketManager.cs" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/Scripts/NetworkTest.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Scripts/Test/NetworkTest.cs" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/Scripts/NetworkTest.cs.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Scripts/Test/NetworkTest.cs.meta" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/Scripts/Procedure/Logic/GameSceneLogicProcedure.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Scripts/Procedure/Logic/GameSceneLogicProcedure.cs" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/Scripts/Test.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Scripts/Test/Test.cs" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/Scripts/Test.cs.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Scripts/Test/Test.cs.meta" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/Scripts/UI/MVVM/View/GameSceneMainView.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Scripts/UI/MVVM/View/GameSceneMainView.cs" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/Scripts/UI/MVVM/View/GlobalTipsView.cs" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/Scripts/UI/MVVM/View/GlobalTipsView.cs.meta" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/Scripts/UI/MVVM/ViewModel/GameSceneMainViewModel.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Scripts/UI/MVVM/ViewModel/GameSceneMainViewModel.cs" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/Scripts/UI/MVVM/ViewModel/GlobalTipsUIViewModel.cs" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/Scripts/UI/MVVM/ViewModel/GlobalTipsUIViewModel.cs.meta" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/Scripts/UI/UILogic/GameSceneMainUI.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Scripts/UI/UILogic/GameSceneMainUI.cs" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/Scripts/UI/UILogic/GlobalTipsUI.cs" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/Scripts/UI/UILogic/GlobalTipsUI.cs.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Scripts/UI/UILogic/GlobalStrongTipsUI.cs.meta" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/Scripts/UI/UILogic/InputNameUI.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Scripts/UI/UILogic/InputNameUI.cs" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/Scripts/UI/UIType.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Scripts/UI/UIType.cs" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/StreamingAssets/yoo/DefaultPackage/4e59e2bd9898a60ac6f34a83b294b143.bundle" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/StreamingAssets/yoo/DefaultPackage/4e59e2bd9898a60ac6f34a83b294b143.bundle.meta" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/StreamingAssets/yoo/DefaultPackage/668352bfa2f427863b0b136f58f0d5b5.bundle" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/StreamingAssets/yoo/DefaultPackage/668352bfa2f427863b0b136f58f0d5b5.bundle.meta" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/StreamingAssets/yoo/DefaultPackage/8fb41250decb653756535901c4cbb85b.bundle" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/StreamingAssets/yoo/DefaultPackage/8fb41250decb653756535901c4cbb85b.bundle.meta" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/StreamingAssets/yoo/DefaultPackage/PackageManifest_DefaultPackage.version" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/StreamingAssets/yoo/DefaultPackage/PackageManifest_DefaultPackage.version" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/StreamingAssets/yoo/DefaultPackage/PackageManifest_DefaultPackage_2024-04-27-1036.bytes" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/StreamingAssets/yoo/DefaultPackage/PackageManifest_DefaultPackage_2024-04-27-1036.bytes.meta" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/StreamingAssets/yoo/DefaultPackage/PackageManifest_DefaultPackage_2024-04-27-1036.hash" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/StreamingAssets/yoo/DefaultPackage/PackageManifest_DefaultPackage_2024-04-27-1036.hash.meta" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/StreamingAssets/yoo/DefaultPackage/acc6d507260420deaf2249f60b8441b6.bundle" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/StreamingAssets/yoo/DefaultPackage/acc6d507260420deaf2249f60b8441b6.bundle.meta" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/Bundles/Android/DefaultPackage/2024-04-27-1036/0fcdb1f7e47b46662e2ce6a0555441d9.bundle" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/Bundles/Android/DefaultPackage/2024-04-27-1036/24faa8c8dab37ef2ad69ed0f7ad38126.bundle" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/Bundles/Android/DefaultPackage/2024-04-27-1036/38f126c3049ce63d988083fef666a174.bundle" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/Bundles/Android/DefaultPackage/2024-04-27-1036/4cc947fd9b21e43a443ba995ae0e2f8d.bundle" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/Bundles/Android/DefaultPackage/2024-04-27-1036/4e59e2bd9898a60ac6f34a83b294b143.bundle" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/Bundles/Android/DefaultPackage/2024-04-27-1036/668352bfa2f427863b0b136f58f0d5b5.bundle" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/Bundles/Android/DefaultPackage/2024-04-27-1036/6e493c6dd41ebe160a1dc4e699fc5f1e.bundle" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/Bundles/Android/DefaultPackage/2024-04-27-1036/8fb41250decb653756535901c4cbb85b.bundle" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/Bundles/Android/DefaultPackage/2024-04-27-1036/99da34fb6ff0d8471c19d33110d6ec5a.bundle" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/Bundles/Android/DefaultPackage/2024-04-27-1036/BuildReport_DefaultPackage_2024-04-27-1036.json" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/Bundles/Android/DefaultPackage/2024-04-27-1036/OutputCache" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/Bundles/Android/DefaultPackage/2024-04-27-1036/OutputCache.manifest" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/Bundles/Android/DefaultPackage/2024-04-27-1036/PackageManifest_DefaultPackage.version" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/Bundles/Android/DefaultPackage/2024-04-27-1036/PackageManifest_DefaultPackage_2024-04-27-1036.bytes" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/Bundles/Android/DefaultPackage/2024-04-27-1036/PackageManifest_DefaultPackage_2024-04-27-1036.hash" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/Bundles/Android/DefaultPackage/2024-04-27-1036/PackageManifest_DefaultPackage_2024-04-27-1036.json" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/Bundles/Android/DefaultPackage/2024-04-27-1036/a138473dc0a7159424a9f5a869d00ef6.bundle" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/Bundles/Android/DefaultPackage/2024-04-27-1036/acc6d507260420deaf2249f60b8441b6.bundle" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/Bundles/Android/DefaultPackage/OutputCache/OutputCache" beforeDir="false" afterPath="$PROJECT_DIR$/Bundles/Android/DefaultPackage/OutputCache/OutputCache" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Bundles/Android/DefaultPackage/OutputCache/OutputCache.manifest" beforeDir="false" afterPath="$PROJECT_DIR$/Bundles/Android/DefaultPackage/OutputCache/OutputCache.manifest" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Bundles/Android/DefaultPackage/OutputCache/defaultpackage_assets_gameres_prefabs_room.bundle" beforeDir="false" afterPath="$PROJECT_DIR$/Bundles/Android/DefaultPackage/OutputCache/defaultpackage_assets_gameres_prefabs_room.bundle" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Bundles/Android/DefaultPackage/OutputCache/defaultpackage_assets_gameres_prefabs_room.bundle.manifest" beforeDir="false" afterPath="$PROJECT_DIR$/Bundles/Android/DefaultPackage/OutputCache/defaultpackage_assets_gameres_prefabs_room.bundle.manifest" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Bundles/Android/DefaultPackage/OutputCache/defaultpackage_assets_gameres_prefabs_ui.bundle" beforeDir="false" afterPath="$PROJECT_DIR$/Bundles/Android/DefaultPackage/OutputCache/defaultpackage_assets_gameres_prefabs_ui.bundle" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Bundles/Android/DefaultPackage/OutputCache/defaultpackage_assets_gameres_prefabs_ui.bundle.manifest" beforeDir="false" afterPath="$PROJECT_DIR$/Bundles/Android/DefaultPackage/OutputCache/defaultpackage_assets_gameres_prefabs_ui.bundle.manifest" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Bundles/Android/DefaultPackage/OutputCache/defaultpackage_assets_gameres_prefabs_ui_item.bundle" beforeDir="false" afterPath="$PROJECT_DIR$/Bundles/Android/DefaultPackage/OutputCache/defaultpackage_assets_gameres_prefabs_ui_item.bundle" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Bundles/Android/DefaultPackage/OutputCache/defaultpackage_assets_gameres_prefabs_ui_item.bundle.manifest" beforeDir="false" afterPath="$PROJECT_DIR$/Bundles/Android/DefaultPackage/OutputCache/defaultpackage_assets_gameres_prefabs_ui_item.bundle.manifest" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Bundles/Android/DefaultPackage/OutputCache/defaultpackage_assets_gameres_scene.bundle" beforeDir="false" afterPath="$PROJECT_DIR$/Bundles/Android/DefaultPackage/OutputCache/defaultpackage_assets_gameres_scene.bundle" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Bundles/Android/DefaultPackage/OutputCache/defaultpackage_assets_gameres_scene.bundle.manifest" beforeDir="false" afterPath="$PROJECT_DIR$/Bundles/Android/DefaultPackage/OutputCache/defaultpackage_assets_gameres_scene.bundle.manifest" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Bundles/Android/DefaultPackage/Simulate/PackageManifest_DefaultPackage_Simulate.bytes" beforeDir="false" afterPath="$PROJECT_DIR$/Bundles/Android/DefaultPackage/Simulate/PackageManifest_DefaultPackage_Simulate.bytes" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Bundles/Android/DefaultPackage/Simulate/PackageManifest_DefaultPackage_Simulate.hash" beforeDir="false" afterPath="$PROJECT_DIR$/Bundles/Android/DefaultPackage/Simulate/PackageManifest_DefaultPackage_Simulate.hash" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Bundles/Android/DefaultPackage/Simulate/PackageManifest_DefaultPackage_Simulate.json" beforeDir="false" afterPath="$PROJECT_DIR$/Bundles/Android/DefaultPackage/Simulate/PackageManifest_DefaultPackage_Simulate.json" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/Scripts/Procedure/Logic/GameSceneSettlementProcedure.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Scripts/Procedure/Logic/GameSceneSettlementProcedure.cs" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/Scripts/Procedure/Logic/LoadingHallSceneProcedure.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Scripts/Procedure/Logic/LoadingHallSceneProcedure.cs" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
@ -305,7 +230,7 @@
<workItem from="1714871290863" duration="12362000" />
<workItem from="1714956257218" duration="16430000" />
<workItem from="1714976694732" duration="9489000" />
<workItem from="1714987550786" duration="1088000" />
<workItem from="1714987550786" duration="2275000" />
</task>
<servers />
</component>
@ -378,32 +303,6 @@
</properties>
<option name="timeStamp" value="72" />
</line-breakpoint>
<line-breakpoint enabled="true" type="DotNet Breakpoints">
<url>file://$PROJECT_DIR$/Assets/Scripts/UI/UILogic/GlobalWeakTipsUI.cs</url>
<line>26</line>
<properties documentPath="D:\UnityProject\TestF\Assets\Scripts\UI\UILogic\GlobalWeakTipsUI.cs" initialLine="26" containingFunctionPresentation="Method 'OnClose'">
<startOffsets>
<option value="662" />
</startOffsets>
<endOffsets>
<option value="709" />
</endOffsets>
</properties>
<option name="timeStamp" value="78" />
</line-breakpoint>
<line-breakpoint enabled="true" type="DotNet Breakpoints">
<url>file://$PROJECT_DIR$/Assets/Scripts/UI/UILogic/GlobalWeakTipsUI.cs</url>
<line>31</line>
<properties documentPath="D:\UnityProject\TestF\Assets\Scripts\UI\UILogic\GlobalWeakTipsUI.cs" initialLine="31" containingFunctionPresentation="Method 'ShowTips'">
<startOffsets>
<option value="788" />
</startOffsets>
<endOffsets>
<option value="831" />
</endOffsets>
</properties>
<option name="timeStamp" value="79" />
</line-breakpoint>
</breakpoints>
</breakpoint-manager>
</component>

2
Assets/Scripts/Log/Log.cs
View File

@ -1,4 +1,4 @@
namespace Game.Log
namespace Game
{
/// <summary>
/// 便于真机上取消log

35
Assets/Scripts/Network/SocketManager.cs
View File

@ -251,7 +251,7 @@ namespace Game
private void OnMessage(object sender, MessageEventArgs e)
{
UnityEngine.Debug.Log($"OnMessage : {e.Data}");
Log.Debug($"OnMessage : {e.Data}");
if (e.Data.Contains("ping"))
{
@ -271,7 +271,7 @@ namespace Game
}
catch (Exception exception)
{
Debug.Log($"{e.Data} 不是服务器主动推送的消息");
Log.Debug($"{e.Data} 不是服务器主动推送的消息");
}
Response response = null;
@ -287,48 +287,25 @@ namespace Game
}
catch (Exception exception)
{
Debug.Log($"解析失败，数据是：{e.Data} \n不是请求回复的消息");
Log.Debug($"解析失败，数据是：{e.Data} \n不是请求回复的消息");
}
// try
// {
// response = JsonConvert.DeserializeObject<Response>(e.Data);
// }
// finally
// {
// if (this.callbacks.TryGetValue(response.requestKey, out var value))
// {
// this.callbackQueue.Enqueue(value);
// this.jsonQueue.Enqueue(e.Data);
// this.callbacks.Remove(response.requestKey);
// }
// }
//
// Debug.Log($"解析失败，数据是：{e.Data} \n不是请求回复的消息");
//
// if (response != null && this.callbacks.TryGetValue(response.requestKey, out var value))
// {
// this.callbackQueue.Enqueue(value);
// this.jsonQueue.Enqueue(e.Data);
// this.callbacks.Remove(response.requestKey);
// }
}
private void OnError(object sender, ErrorEventArgs e)
{
UnityEngine.Debug.Log($"OnError : {e.Message}");
Log.Debug($"OnError : {e.Message}");
}
private void OnOpen(object sender, EventArgs e)
{
// UnityEngine.Debug.Log($"OnOpen : {e}");
Debug.Log("token is " + this.token);
Log.Debug("token is " + this.token);
}
private void OnClose(object sender, CloseEventArgs e)
{
isWebSocketConnected = false;
UnityEngine.Debug.Log($"OnClose : {e.Code}");
Log.Debug($"OnClose : {e.Code}");
}
}
}

29
Assets/Scripts/Procedure/Logic/GameSceneLogicProcedure.cs
View File

@ -35,38 +35,9 @@ namespace Game
this._dinosaursGameManager.robotManager.DeleteAllRobot();
}
// private void BackHallSceneEvent(object sender, GameEventArgs e)
// {
// if (!_dinosaursGameManager.IsCanStopGame)
// return;
//
// var c2SExitGame = new C2S_ExitGame();
// c2SExitGame.lunId = this._dinosaursGameManager.lunId;
// Game.socketManager.SendMessage(c2SExitGame, Callback);
//
// void Callback(string obj)
// {
// var s2CExitGame = CommonHelper.DeserializeObject<S2C_ExitGame>(obj);
// if (s2CExitGame.code == ResponseCode.Success)
// {
// Game.uiManager.CloseAll();
//
// // TODO
// Game.resourceManager.UnloadSceneAsync(AssetConstPath.Assets_GameRes_Scene_Game);
// _dinosaursGameManager.Dispose();
// this._dinosaursGameManager = null;
//
// Game.uiManager.ShowUI(UIType.HallSceneMainUI);
// Game.procedureManager.ChangeProcedure(ProcedureType.HallSceneMainLogicProcedure);
// }
// }
// }
public override void OnLeave()
{
base.OnLeave();
// EventManager.Instance.Unsubscribe(BackHallSSceneEventArgs.EventId, this.BackHallSceneEvent);
// EventManager.Instance.Unsubscribe(AddRobotEventArgs.EventId, this.AddRobotEvent);
this._dinosaursGameManager.Dispose();
this._dinosaursGameManager = null;
EventManager.Instance.Unsubscribe(DeleteAllRobotEventArgs.EventId, this.DeleteAllRobotEvent);

5
Assets/Scripts/Procedure/Logic/GameSceneSettlementProcedure.cs
View File

@ -17,10 +17,5 @@ namespace Game
Game.procedureManager.ChangeProcedure(ProcedureType.GameSceneLogicProcedure);
});
}
public override void OnLeave()
{
base.OnLeave();
}
}
}

2
Assets/Scripts/Procedure/Logic/LoadingHallSceneProcedure.cs
View File

@ -20,8 +20,6 @@ namespace Game
private void InputNameFinishEvent(object sender, GameEventArgs e)
{
var args = e as InputNameFinishEventArgs;
// var player = Game.playerManager.CreatePlayer(args.playerName, 1000);
// Game.playerManager.SetCurrentPlayer(player);
Game.socketManager.ConnectAsync();
Game.procedureManager.ChangeProcedure(ProcedureType.HallSceneMainLogicProcedure);