From 9a5789dd048b249b8adff464d290ca657f206bc2 Mon Sep 17 00:00:00 2001 From: yuhonglei Date: Fri, 19 Apr 2024 13:59:49 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=AE=8C=E5=96=84]=E4=BA=BA=E5=91=98=E5=AE=9A?= =?UTF-8?q?=E4=BD=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AddressableAssetSettings.asset | 15 ++++++++------- .../WebGL/addressables_content_state.bin | Bin 17631 -> 17631 bytes .../Characters/Character1.prefab | 2 +- .../Characters/Character2.prefab | 2 +- .../Characters/Character3.prefab | 2 +- .../Characters/Character4.prefab | 2 +- .../Characters/Character5.prefab | 2 +- Assets/Scenes/MainScene.unity | 2 +- .../Core/PersonnelLocation/AgentController.cs | 18 +++++++++--------- .../PersonnelLocation/LocationSimulator.cs | 3 +-- .../PersonnelLocation/WorkAIController.cs | 2 +- 11 files changed, 25 insertions(+), 25 deletions(-) diff --git a/Assets/AddressableAssetsData/AddressableAssetSettings.asset b/Assets/AddressableAssetsData/AddressableAssetSettings.asset index 3abc20f..5249a29 100644 --- a/Assets/AddressableAssetsData/AddressableAssetSettings.asset +++ b/Assets/AddressableAssetsData/AddressableAssetSettings.asset @@ -29,11 +29,14 @@ MonoBehaviour: m_ShaderBundleNaming: 0 m_ShaderBundleCustomNaming: m_MonoScriptBundleNaming: 0 + m_CheckForContentUpdateRestrictionsOption: 0 m_MonoScriptBundleCustomNaming: m_RemoteCatalogBuildPath: m_Id: m_RemoteCatalogLoadPath: m_Id: + m_ContentStateBuildPathProfileVariableName: + m_CustomContentStateBuildPath: m_ContentStateBuildPath: m_BuildAddressablesWithPlayerBuild: 2 m_overridePlayerVersion: @@ -79,16 +82,16 @@ MonoBehaviour: m_Name: BuildTarget m_InlineUsage: 0 - m_Id: 7fc0283356a1e2c4e93a557c23a49695 - m_Name: LocalBuildPath + m_Name: Local.BuildPath m_InlineUsage: 0 - m_Id: 697bfab9adf903b4d94edab779471d3d - m_Name: LocalLoadPath + m_Name: Local.LoadPath m_InlineUsage: 0 - m_Id: cf68557ac9a2f534791f136de507f431 - m_Name: RemoteBuildPath + m_Name: Remote.BuildPath m_InlineUsage: 0 - m_Id: a9d6f23b6de9d724aa47ef949582563a - m_Name: RemoteLoadPath + m_Name: Remote.LoadPath m_InlineUsage: 0 m_ProfileVersion: 1 m_LabelTable: @@ -123,6 +126,4 @@ MonoBehaviour: m_Settings: {fileID: 11400000} m_NextInstanceId: 0 m_RegisteredServiceTypeRefs: [] - m_GlobalProfileVariablesInfos: - - key: PrivateIpAddress - value: 192.168.1.34 + m_PingTimeoutInMilliseconds: 5000 diff --git a/Assets/AddressableAssetsData/WebGL/addressables_content_state.bin b/Assets/AddressableAssetsData/WebGL/addressables_content_state.bin index 3dbb41511efb06e4f5bd715c8f85c8320b7e3022..ed4ebf89e0967b3d5bafd11bdfaae7c20163ab9b 100644 GIT binary patch delta 1552 zcmai!c~BEq9LIUVB65dFb}e!Z(c(;nWH;ABvEe8KR*H<3ai$_9%f{9Q!~;;UKnvyY z=%}xXrPX@WYsz8G2!bsTYmo{n8pTqzs3=g4atKD44jDU^CrM^mIyK`1C_@!Jrn)6sgFT%px!Ns5rEv^1GPsA(oc zN+>y#)EU33aA4WJ$bgLEfi5 zrM@^2B30mJh21hN(vv3}cE%})2BKR@m&JF51$YAwM7nc@eZJw}MzgA$V`6GdPn|yM zxD*cDtdNyrMXm^R;lWo+3tF=dJx)9^w7js+7O)e{;TrZ2F&Up%A6~n1S0@qTv|+3S z1I|dD&8rUCrk|aehl$@@NU`YSM(TkRub#vAx#hpR$gwKDWhx-?^HlH_QhjIf?l#IW z{ljQ+QeDd8KC@SSCUCUEH41SN5Fixr%l=kM3+91}xXGtDB2JYBfD(eM6At z_uXhF$Xsrt=ZLhxYjRxhjD@2KQp|3U+a3x-&@2N%16K@<S|jutMnt zdSM%hyZnW$JJ6)SgL{xQJGX3LwO{h;9oM&74>q@g+ladb3nOrendgq?2gR?t+tPpf z*V9Q4J)iZ1n~1x?!W-PNcJp9+^O1QSmg%+PGYg6;Shrumbp&2x;cjnCaFvBZDdy6J z;!fBajt5`ib*}@Rx~j0NQFS#rCmfnK4TC=s*8y87TyU9%Q5bis?I`|(g;F0Z@)GZ> z5{EonjTwy=xbNPXN1)jyRXVqI>AgCU&k#h?$^cjUr3iX`91f;cToR@@BKqX|}Pf*(rz?qZ!?r z*so)3cC(3bvYdtIIfgcwIe|6Uc;3la%q(x>QD^if9p_*SB4@I59AhvFtiXyiYiC7+ zMc`T9W;VLFPCBg8IUGj8Mq5PIA<&%N#ev$a|k=|d+C zgqrXT4V@ku8iFVvnq(qkBIW+1++Qv~GOo6Ba81;y*qmLG=0_Nd!3eaDCaG|R+uiM2 z*jaDW#-)`-I)z8yffjRPd}y+PfUtex#M=;x)zNZMD(7!p)yU;ySr@RX^ zO5o-kSWzhS`d%`|o%c1Fn?a4OAwHBdornomz@n@vbC%t!YAdcRUf2@W(FUV17=-qQ zlT@I>y*uJrL)jwJse$pn?A(-@_3#SjM*7fo69FTTl^`^r!ZP^KHim!zv?xNBha_b{ zJ_+SU5g?&KntW>zt1sok|28tp%0aqNcA%;_DZNZ zf=KL9+%*SVcj&v8Z`X|5Sh+thuot>9*d-VK7p!o6QCwUcYdyXtc(N+GqY9o%X!SIL zdV;}D1q|5eIWfxFGXJxRrJdsJ?o#NGkd`K>#~A!a0heVTD0%2sC+7!#=}C7TZh%J; zD%BI}b__n0&<%o^@j&kVlSpY*^TGvJ==6*?2bO;1NrJyI*rp@`pK&fB!!^HZ_0wmc zw%>UHttiY$hO}U=8C^G!swN2?85^a6zp#8?Lg%LuK|gs1^fH-XSNEjErB}{`kahX!yh=L5#^dm>b8=R(>`&~Rlh&`JpaLg zcM3c%xP`d}3Ek8alve>ey1h#Z#@m-13W}IFS4`Of^%%S^R~|3E;1`hVx0BPIX< diff --git a/Assets/Ready Player Me/Characters/Character1.prefab b/Assets/Ready Player Me/Characters/Character1.prefab index e2c7555..32b0274 100644 --- a/Assets/Ready Player Me/Characters/Character1.prefab +++ b/Assets/Ready Player Me/Characters/Character1.prefab @@ -3652,7 +3652,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &2728067710616108587 RectTransform: m_ObjectHideFlags: 0 diff --git a/Assets/Ready Player Me/Characters/Character2.prefab b/Assets/Ready Player Me/Characters/Character2.prefab index ef9be6d..d5a7cf9 100644 --- a/Assets/Ready Player Me/Characters/Character2.prefab +++ b/Assets/Ready Player Me/Characters/Character2.prefab @@ -729,7 +729,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &1308495718387535865 RectTransform: m_ObjectHideFlags: 0 diff --git a/Assets/Ready Player Me/Characters/Character3.prefab b/Assets/Ready Player Me/Characters/Character3.prefab index 2cfd590..bf51cea 100644 --- a/Assets/Ready Player Me/Characters/Character3.prefab +++ b/Assets/Ready Player Me/Characters/Character3.prefab @@ -938,7 +938,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &3216045419867727480 RectTransform: m_ObjectHideFlags: 0 diff --git a/Assets/Ready Player Me/Characters/Character4.prefab b/Assets/Ready Player Me/Characters/Character4.prefab index 2dec004..f7f0ac0 100644 --- a/Assets/Ready Player Me/Characters/Character4.prefab +++ b/Assets/Ready Player Me/Characters/Character4.prefab @@ -4141,7 +4141,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &5390027276396768406 RectTransform: m_ObjectHideFlags: 0 diff --git a/Assets/Ready Player Me/Characters/Character5.prefab b/Assets/Ready Player Me/Characters/Character5.prefab index 88fea06..442202b 100644 --- a/Assets/Ready Player Me/Characters/Character5.prefab +++ b/Assets/Ready Player Me/Characters/Character5.prefab @@ -3764,7 +3764,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &2419738418584790563 RectTransform: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/MainScene.unity b/Assets/Scenes/MainScene.unity index 4996a7b..ca05a52 100644 --- a/Assets/Scenes/MainScene.unity +++ b/Assets/Scenes/MainScene.unity @@ -895,7 +895,7 @@ MonoBehaviour: y: 12.59996 isDragEnabled: 1 moveSpeed: 10 - minHeight: -5 + minHeight: -20 maxHeight: 140 isAutoRotate: 0 RotSpeed: 5 diff --git a/Assets/Scripts/Main/Core/PersonnelLocation/AgentController.cs b/Assets/Scripts/Main/Core/PersonnelLocation/AgentController.cs index 875b80a..37c1cda 100644 --- a/Assets/Scripts/Main/Core/PersonnelLocation/AgentController.cs +++ b/Assets/Scripts/Main/Core/PersonnelLocation/AgentController.cs @@ -42,16 +42,16 @@ public class AgentController : MonoBehaviour /// public void UpdatePosition(LocationData data) { - var pos =Main.LocationSimulator.ConversionTransform(data); - if (data.targetNo == 10774520) - { - var info = $"卡号:{data.targetNo} - 定位基站:{data.stations} - 位置{pos}"; - Debug.Log(info); - } + //var pos =Main.LocationSimulator.ConversionTransform(data); + //if (data.targetNo == 10774520) + //{ + // var info = $"卡号:{data.targetNo} - 定位基站:{data.stations} - 位置{pos}"; + // Debug.Log(info); + //} - if (Vector3.Distance(transform.position, pos) < Config.Range) - return; - OnMoveTo(pos); + //if (Vector3.Distance(transform.position, pos) < Config.Range) + // return; + //OnMoveTo(pos); ShowStatus(data.createdTime, targetNo); diff --git a/Assets/Scripts/Main/Core/PersonnelLocation/LocationSimulator.cs b/Assets/Scripts/Main/Core/PersonnelLocation/LocationSimulator.cs index fc09d02..2212208 100644 --- a/Assets/Scripts/Main/Core/PersonnelLocation/LocationSimulator.cs +++ b/Assets/Scripts/Main/Core/PersonnelLocation/LocationSimulator.cs @@ -221,8 +221,7 @@ public class LocationSimulator : MonoBehaviour if (agentControllers.ContainsKey(data.targetNo)) { - //agentControllers[data.targetNo].UpdatePosition(data); - agentControllers[data.targetNo].enabled = false; + agentControllers[data.targetNo].UpdatePosition(data); agentControllers[data.targetNo].transform.position = Main.LocationSimulator.ConversionTransform(data); } else diff --git a/Assets/Scripts/Main/Core/PersonnelLocation/WorkAIController.cs b/Assets/Scripts/Main/Core/PersonnelLocation/WorkAIController.cs index 8344588..493ee0c 100644 --- a/Assets/Scripts/Main/Core/PersonnelLocation/WorkAIController.cs +++ b/Assets/Scripts/Main/Core/PersonnelLocation/WorkAIController.cs @@ -66,7 +66,7 @@ public class WorkAIController : MonoBehaviour { if (this.targetNo == targetNo) { - var pos = new Vector3(transform.position.x, 0.9f, transform.position.z); + var pos = new Vector3(transform.position.x, transform.position.y+0.9f, transform.position.z); CameraOrbit.Instance.SetCameraView(pos, 3f); SelectionManager.Instance.AddGameObjectToSelection(gameObject); if (isShow)