Skip to content

Commit b436a55

Browse files
committed
1.修复服务端一个position报错
2.ResourceComponent并发加载修复,简化封装的Unity异步加载ab包的方法 3.更新运行指南
1 parent b72bef5 commit b436a55

File tree

9 files changed

+141
-270
lines changed

9 files changed

+141
-270
lines changed

Book/1.1运行指南.md

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,14 @@
11
# 运行步骤
2-
##### 1.visual studio必须使用vs2017(更新到最新版), VS2017需要勾选安装以下内容:
2+
##### 1.visual studio必须使用vs2019(更新到最新版), VS2019需要勾选安装以下内容:
33
a. .net 桌面开发
4-
b. visual studio tools for unity
5-
c. 去net core 官网下载安装 .net core 2.1
6-
##### 2. master分支需要unity2018.3版(目前还是beta版), ET4.0请使用unity2017.4版
4+
b. 去net core 官网下载安装 .net5
5+
##### 2. master分支需要unity2020.3版
76

87
##### 3. 启动unity, 菜单 File->open project->open 选中ET/Unity文件夹,点击选择文件夹按钮。
98

109
##### 4.点击Unity菜单Assets->open C# project启动vs 编译(一定要编译,右键VS解决方案,全部编译)
1110

12-
##### 5.用vs2017打开ET/Server/Server.sln 编译(一定要编译,右键VS解决方案,全部编译)
13-
14-
##### 6.打开Unity->tools菜单->命令行配置,选择LocalAllServer.txt 这是启动单一App的方式,如果要启动一组多App服务器,在命令行工具中选择127.0.0.1.txt,点击启动即可,具体配置都可以自己用这个命令行配置工具修改
15-
##### 7.点击工具中的启动,这样就启动了服务端(也可以用VS启动,方便单步调试)
16-
##### 8.运行Unity,输入帐号,点击登录这时日志 连接Gate成功,表示运行OK!
11+
##### 5.用vs2019打开ET/Client-Server.sln 编译(一定要编译,右键VS解决方案,全部编译)
1712

1813

1914
# 测试状态同步demo, 帧同步demo已经删除,需要的话请看ET4.0
@@ -28,8 +23,8 @@ c. 去net core 官网下载安装 .net core 2.1
2823

2924
一. 出错原因都是:
3025
1.中文目录。
31-
2.vs没有安装vs tools或者不是最新的vs tools。
32-
3.没安装 .net core 2.1
26+
2.vs没有安装vs
27+
3.没安装 .net5
3328
4.没编译服务端
3429
5.VS要更新到最新版本
3530

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ __讨论QQ群 : 474643097__
44

55
[ET论坛](https://et-framework.cn)
66

7-
# 注意!现在master正在开发中,商业使用请用5.0分支,6.0(master分支)可以参考
7+
# 注意!现在master(6.0版)还在开发中,不过基本架构已经完成
88

99
# ET的介绍:
1010
ET是一个开源的游戏客户端(基于unity3d)服务端双端框架,服务端是使用C# .net core开发的分布式游戏服务端,其特点是开发效率高,性能强,双端共享逻辑代码,客户端服务端热更机制完善,同时支持可靠udp tcp websocket协议,支持服务端3D recast寻路等等

Unity/Assets/HotfixView/Unit/ChangePosition_SyncGameObjectPos.cs

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,12 @@ public class ChangePosition_SyncGameObjectPos: AEvent<EventType.ChangePosition>
66
{
77
protected override async ETTask Run(EventType.ChangePosition args)
88
{
9-
Transform transform = args.Unit.GetComponent<GameObjectComponent>().GameObject.transform;
9+
GameObjectComponent gameObjectComponent = args.Unit.GetComponent<GameObjectComponent>();
10+
if (gameObjectComponent == null)
11+
{
12+
return;
13+
}
14+
Transform transform = gameObjectComponent.GameObject.transform;
1015
transform.position = args.Unit.Position;
1116
await ETTask.CompletedTask;
1217
}

Unity/Assets/Model/Module/Resource/AssetsBundleLoaderAsync.cs

Lines changed: 0 additions & 49 deletions
This file was deleted.

Unity/Assets/Model/Module/Resource/AssetsBundleLoaderAsync.cs.meta

Lines changed: 0 additions & 3 deletions
This file was deleted.

Unity/Assets/Model/Module/Resource/AssetsLoaderAsync.cs

Lines changed: 0 additions & 74 deletions
This file was deleted.

Unity/Assets/Model/Module/Resource/AssetsLoaderAsync.cs.meta

Lines changed: 0 additions & 3 deletions
This file was deleted.

0 commit comments

Comments
 (0)