7 Commits

Author	SHA1	Message	Date
lishuo	70626ae741	Merge remote-tracking branch 'origin/dev' into dev_lishuo ... # Conflicts: # Assets/NuGet.meta # Assets/Resources/Images/Ride.meta # Assets/Resources/Sound.meta # Assets/Scripts/App.cs # Assets/Scripts/UI/Prefab/BigMap/Tips.cs # Assets/StreamingAssets.meta	2021-04-15 17:14:00 +08:00
lishuo	92e43c2cd8	路线产生逻辑微调	2021-04-15 17:09:35 +08:00
CaiYanPeng	c97bd50f3f	暂存	2021-04-15 15:58:37 +08:00
suntao	5156473bb2	加弹框。修改连接设备样式。	2021-04-09 09:44:06 +08:00
lishuo	dad88828d2	合并后处理冲突	2021-03-30 19:32:11 +08:00
suntao	38d1c387c3	加场景切换和事件绑定功能	2021-03-29 09:10:59 +08:00
suntao	f557e2f5df	添加nuget和网络请求api	2021-03-22 16:06:28 +08:00