diff --git a/Assets/Plugins/Android/Main.java b/Assets/Plugins/Android/Main.java index fd628d4c..9a3668fe 100644 --- a/Assets/Plugins/Android/Main.java +++ b/Assets/Plugins/Android/Main.java @@ -7,6 +7,8 @@ import android.os.Looper; import android.app.Service; import android.content.Intent; import android.os.IBinder; +import android.os.PowerManager; +import android.net.wifi.WifiManager; import android.util.Log; import android.os.Build; import android.app.NotificationChannel; @@ -109,10 +111,21 @@ public class Main extends Service { // ================= MQTT 服务 ================= private MqttClient mqttClient; - private static final String MQTT_BROKER_URL = "tcp://192.168.0.105:1883"; + private static final String MQTT_BROKER_URL = "ws://emqx.pineappletech.cn"; private static final String MQTT_CLIENT_ID_PREFIX = "pico_"; private ScheduledExecutorService mqttScheduler; - private static final long MQTT_REPORT_INTERVAL = 10; // 10秒上报一次 + private static final long MQTT_REPORT_INTERVAL = 20; // 20秒上报一次 + private static final int MQTT_KEEP_ALIVE = 60; // KeepAlive 60秒 + private static final int MQTT_CONNECTION_TIMEOUT = 30; // 连接超时30秒 + private volatile boolean isMqttReconnecting = false; + private int mqttReconnectAttempts = 0; + private static final int MAX_RECONNECT_ATTEMPTS = 10; + private static final long RECONNECT_DELAY_MS = 5000; // 重连延迟5秒 + + // ================= 唤醒锁 ================= + private PowerManager.WakeLock wakeLock; + private WifiManager.WifiLock wifiLock; + private static final String WAKE_LOCK_TAG = "PineappleService::WakeLock"; // ================= 服务生命周期 ================= @Override @@ -178,12 +191,56 @@ public class Main extends Service { // 启动Http服务 startHttpReceiver(); + // 初始化唤醒锁 + initWakeLocks(); + // 启动MQTT服务 initMqttService(); // return START_STICKY; } + /** + * 初始化唤醒锁,防止设备进入 Doze 模式导致 MQTT 断线 + */ + private void initWakeLocks() { + try { + // 获取 PowerManager 并创建 WakeLock + PowerManager powerManager = (PowerManager) getSystemService(Context.POWER_SERVICE); + wakeLock = powerManager.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, WAKE_LOCK_TAG); + wakeLock.setReferenceCounted(false); + wakeLock.acquire(); + Log.i(TAG, "唤醒锁已获取"); + + // 获取 WifiManager 并创建 WifiLock + WifiManager wifiManager = (WifiManager) getApplicationContext().getSystemService(Context.WIFI_SERVICE); + wifiLock = wifiManager.createWifiLock(WifiManager.WIFI_MODE_FULL_HIGH_PERF, WAKE_LOCK_TAG); + wifiLock.setReferenceCounted(false); + wifiLock.acquire(); + Log.i(TAG, "WiFi 锁已获取"); + } catch (Exception e) { + Log.e(TAG, "初始化唤醒锁失败: " + e.getMessage()); + } + } + + /** + * 释放唤醒锁 + */ + private void releaseWakeLocks() { + try { + if (wakeLock != null && wakeLock.isHeld()) { + wakeLock.release(); + Log.i(TAG, "唤醒锁已释放"); + } + if (wifiLock != null && wifiLock.isHeld()) { + wifiLock.release(); + Log.i(TAG, "WiFi 锁已释放"); + } + } catch (Exception e) { + Log.e(TAG, "释放唤醒锁失败: " + e.getMessage()); + } + } + @Override public void onDestroy() { super.onDestroy(); @@ -217,6 +274,9 @@ public class Main extends Service { // 断开MQTT连接 disconnectMqtt(); + + // 释放唤醒锁 + releaseWakeLocks(); } private String getIpAddressFromPico() { @@ -791,14 +851,18 @@ public class Main extends Service { MqttConnectOptions options = new MqttConnectOptions(); options.setCleanSession(true); - options.setConnectionTimeout(10); - options.setKeepAliveInterval(20); + options.setConnectionTimeout(MQTT_CONNECTION_TIMEOUT); + options.setKeepAliveInterval(MQTT_KEEP_ALIVE); options.setAutomaticReconnect(true); + // 设置最大重连间隔为60秒 + options.setMaxReconnectDelay(60000); mqttClient.setCallback(new MqttCallback() { @Override public void connectionLost(Throwable cause) { Log.e(TAG, "MQTT 连接丢失: " + cause.getMessage()); + // 触发重连 + scheduleMqttReconnect(); } @Override @@ -814,12 +878,60 @@ public class Main extends Service { mqttClient.connect(options); Log.i(TAG, "MQTT 连接成功 - ClientID: " + clientId); + // 重置重连计数 + mqttReconnectAttempts = 0; + isMqttReconnecting = false; // 启动定时上报任务 startMqttReportTask(); } catch (MqttException e) { Log.e(TAG, "MQTT 连接失败: " + e.getMessage()); + // 连接失败也触发重连 + scheduleMqttReconnect(); + } + }); + } + + /** + * 调度 MQTT 重连 + */ + private void scheduleMqttReconnect() { + if (isMqttReconnecting) { + Log.d(TAG, "MQTT 重连已在进行中,跳过"); + return; + } + + if (mqttReconnectAttempts >= MAX_RECONNECT_ATTEMPTS) { + Log.e(TAG, "MQTT 重连次数超过最大限制,停止重连"); + return; + } + + isMqttReconnecting = true; + mqttReconnectAttempts++; + + long delay = Math.min(RECONNECT_DELAY_MS * mqttReconnectAttempts, 60000); // 最大延迟60秒 + Log.i(TAG, "MQTT 将在 " + delay + "ms 后进行第 " + mqttReconnectAttempts + " 次重连"); + + networkExecutor.execute(() -> { + try { + Thread.sleep(delay); + // 清理旧连接 + if (mqttClient != null) { + try { + mqttClient.disconnectForcibly(); + mqttClient.close(); + } catch (Exception e) { + // 忽略清理错误 + } + mqttClient = null; + } + // 重新连接 + isMqttReconnecting = false; + connectToMqttBroker(); + } catch (InterruptedException e) { + Log.e(TAG, "MQTT 重连等待被中断: " + e.getMessage()); + isMqttReconnecting = false; } }); } diff --git a/UserSettings/Layouts/default-2022.dwlt b/UserSettings/Layouts/default-2022.dwlt index 753e5b8c..e1e41419 100644 --- a/UserSettings/Layouts/default-2022.dwlt +++ b/UserSettings/Layouts/default-2022.dwlt @@ -1,54 +1,6 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: --- !u!114 &1 -MonoBehaviour: - m_ObjectHideFlags: 52 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 12004, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: - m_PixelRect: - serializedVersion: 2 - x: 474 - y: 252 - width: 1439 - height: 613 - m_ShowMode: 0 - m_Title: Android Logcat - m_RootView: {fileID: 5} - m_MinSize: {x: 100, y: 121} - m_MaxSize: {x: 4000, y: 4021} - m_Maximized: 0 ---- !u!114 &2 -MonoBehaviour: - m_ObjectHideFlags: 52 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 12004, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: - m_PixelRect: - serializedVersion: 2 - x: 938 - y: 109 - width: 899 - height: 801 - m_ShowMode: 0 - m_Title: Build Settings - m_RootView: {fileID: 7} - m_MinSize: {x: 640, y: 601} - m_MaxSize: {x: 4000, y: 4021} - m_Maximized: 0 ---- !u!114 &3 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -68,113 +20,11 @@ MonoBehaviour: height: 989 m_ShowMode: 4 m_Title: "\u63A7\u5236\u53F0" - m_RootView: {fileID: 8} + m_RootView: {fileID: 2} m_MinSize: {x: 875, y: 300} m_MaxSize: {x: 10000, y: 10000} m_Maximized: 1 ---- !u!114 &4 -MonoBehaviour: - m_ObjectHideFlags: 52 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: AndroidLogcatConsoleWindow - m_EditorClassIdentifier: - m_Children: [] - m_Position: - serializedVersion: 2 - x: 0 - y: 0 - width: 1439 - height: 613 - m_MinSize: {x: 100, y: 121} - m_MaxSize: {x: 4000, y: 4021} - m_ActualView: {fileID: 19} - m_Panes: - - {fileID: 19} - m_Selected: 0 - m_LastSelected: 0 ---- !u!114 &5 -MonoBehaviour: - m_ObjectHideFlags: 52 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 12010, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: - m_Children: - - {fileID: 4} - m_Position: - serializedVersion: 2 - x: 0 - y: 0 - width: 1439 - height: 613 - m_MinSize: {x: 100, y: 121} - m_MaxSize: {x: 4000, y: 4021} - vertical: 0 - controlID: 785 - draggingID: 0 ---- !u!114 &6 -MonoBehaviour: - m_ObjectHideFlags: 52 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: BuildPlayerWindow - m_EditorClassIdentifier: - m_Children: [] - m_Position: - serializedVersion: 2 - x: 0 - y: 0 - width: 899 - height: 801 - m_MinSize: {x: 640, y: 601} - m_MaxSize: {x: 4000, y: 4021} - m_ActualView: {fileID: 20} - m_Panes: - - {fileID: 20} - m_Selected: 0 - m_LastSelected: 0 ---- !u!114 &7 -MonoBehaviour: - m_ObjectHideFlags: 52 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 12010, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: - m_Children: - - {fileID: 6} - m_Position: - serializedVersion: 2 - x: 0 - y: 0 - width: 899 - height: 801 - m_MinSize: {x: 640, y: 601} - m_MaxSize: {x: 4000, y: 4021} - vertical: 0 - controlID: 435 - draggingID: 0 ---- !u!114 &8 +--- !u!114 &2 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -187,9 +37,9 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Children: - - {fileID: 9} - - {fileID: 11} - - {fileID: 10} + - {fileID: 3} + - {fileID: 5} + - {fileID: 4} m_Position: serializedVersion: 2 x: 0 @@ -202,7 +52,7 @@ MonoBehaviour: m_TopViewHeight: 30 m_UseBottomView: 1 m_BottomViewHeight: 20 ---- !u!114 &9 +--- !u!114 &3 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -224,7 +74,7 @@ MonoBehaviour: m_MinSize: {x: 0, y: 0} m_MaxSize: {x: 0, y: 0} m_LastLoadedLayoutName: ---- !u!114 &10 +--- !u!114 &4 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -245,7 +95,7 @@ MonoBehaviour: height: 20 m_MinSize: {x: 0, y: 0} m_MaxSize: {x: 0, y: 0} ---- !u!114 &11 +--- !u!114 &5 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -258,8 +108,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Children: + - {fileID: 6} - {fileID: 12} - - {fileID: 18} m_Position: serializedVersion: 2 x: 0 @@ -269,9 +119,9 @@ MonoBehaviour: m_MinSize: {x: 400, y: 100} m_MaxSize: {x: 32384, y: 16192} vertical: 0 - controlID: 134 + controlID: 238 draggingID: 0 ---- !u!114 &12 +--- !u!114 &6 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -284,8 +134,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Children: - - {fileID: 13} - - {fileID: 17} + - {fileID: 7} + - {fileID: 11} m_Position: serializedVersion: 2 x: 0 @@ -295,9 +145,9 @@ MonoBehaviour: m_MinSize: {x: 300, y: 100} m_MaxSize: {x: 24288, y: 16192} vertical: 1 - controlID: 77 + controlID: 178 draggingID: 0 ---- !u!114 &13 +--- !u!114 &7 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -310,9 +160,9 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Children: - - {fileID: 14} - - {fileID: 15} - - {fileID: 16} + - {fileID: 8} + - {fileID: 9} + - {fileID: 10} m_Position: serializedVersion: 2 x: 0 @@ -322,9 +172,9 @@ MonoBehaviour: m_MinSize: {x: 300, y: 50} m_MaxSize: {x: 24288, y: 8096} vertical: 0 - controlID: 53 + controlID: 179 draggingID: 0 ---- !u!114 &14 +--- !u!114 &8 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -345,12 +195,12 @@ MonoBehaviour: height: 470 m_MinSize: {x: 200, y: 200} m_MaxSize: {x: 4000, y: 4000} - m_ActualView: {fileID: 22} + m_ActualView: {fileID: 14} m_Panes: - - {fileID: 22} + - {fileID: 14} m_Selected: 0 m_LastSelected: 0 ---- !u!114 &15 +--- !u!114 &9 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -369,16 +219,16 @@ MonoBehaviour: y: 0 width: 876 height: 470 - m_MinSize: {x: 202, y: 221} - m_MaxSize: {x: 4002, y: 4021} - m_ActualView: {fileID: 23} + m_MinSize: {x: 200, y: 200} + m_MaxSize: {x: 4000, y: 4000} + m_ActualView: {fileID: 15} m_Panes: - - {fileID: 23} - - {fileID: 24} - - {fileID: 25} + - {fileID: 15} + - {fileID: 16} + - {fileID: 17} m_Selected: 0 m_LastSelected: 1 ---- !u!114 &16 +--- !u!114 &10 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -399,13 +249,13 @@ MonoBehaviour: height: 470 m_MinSize: {x: 202, y: 221} m_MaxSize: {x: 4002, y: 4021} - m_ActualView: {fileID: 21} + m_ActualView: {fileID: 13} m_Panes: - - {fileID: 21} - - {fileID: 26} + - {fileID: 13} + - {fileID: 18} m_Selected: 0 m_LastSelected: 1 ---- !u!114 &17 +--- !u!114 &11 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -426,15 +276,15 @@ MonoBehaviour: height: 469 m_MinSize: {x: 101, y: 121} m_MaxSize: {x: 4001, y: 4021} - m_ActualView: {fileID: 28} + m_ActualView: {fileID: 20} m_Panes: - - {fileID: 27} - - {fileID: 28} - - {fileID: 29} - - {fileID: 30} + - {fileID: 19} + - {fileID: 20} + - {fileID: 21} + - {fileID: 22} m_Selected: 1 m_LastSelected: 0 ---- !u!114 &18 +--- !u!114 &12 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -453,106 +303,16 @@ MonoBehaviour: y: 0 width: 550 height: 939 - m_MinSize: {x: 276, y: 71} - m_MaxSize: {x: 4001, y: 4021} - m_ActualView: {fileID: 31} + m_MinSize: {x: 275, y: 50} + m_MaxSize: {x: 4000, y: 4000} + m_ActualView: {fileID: 23} m_Panes: - - {fileID: 31} - - {fileID: 32} - - {fileID: 33} + - {fileID: 23} + - {fileID: 24} + - {fileID: 25} m_Selected: 0 m_LastSelected: 1 ---- !u!114 &19 -MonoBehaviour: - m_ObjectHideFlags: 52 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: ac9b4e439aace6446a0642ca97e8f43b, type: 3} - m_Name: - m_EditorClassIdentifier: - m_MinSize: {x: 100, y: 100} - m_MaxSize: {x: 4000, y: 4000} - m_TitleContent: - m_Text: Android Logcat - m_Image: {fileID: 0} - m_Tooltip: - m_Pos: - serializedVersion: 2 - x: 474 - y: 252 - width: 1439 - height: 592 - m_SerializedDataModeController: - m_DataMode: 0 - m_PreferredDataMode: 0 - m_SupportedDataModes: - isAutomatic: 1 - m_ViewDataDictionary: {fileID: 0} - m_OverlayCanvas: - m_LastAppliedPresetName: Default - m_SaveData: [] - m_OverlaysVisible: 1 ---- !u!114 &20 -MonoBehaviour: - m_ObjectHideFlags: 52 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 12043, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: - m_MinSize: {x: 640, y: 580} - m_MaxSize: {x: 4000, y: 4000} - m_TitleContent: - m_Text: Build Settings - m_Image: {fileID: 0} - m_Tooltip: - m_Pos: - serializedVersion: 2 - x: 938 - y: 109 - width: 899 - height: 780 - m_SerializedDataModeController: - m_DataMode: 0 - m_PreferredDataMode: 0 - m_SupportedDataModes: - isAutomatic: 1 - m_ViewDataDictionary: {fileID: 0} - m_OverlayCanvas: - m_LastAppliedPresetName: Default - m_SaveData: [] - m_OverlaysVisible: 1 - m_TreeViewState: - scrollPos: {x: 0, y: 0} - m_SelectedIDs: - m_LastClickedID: 0 - m_ExpandedIDs: - m_RenameOverlay: - m_UserAcceptedRename: 0 - m_Name: - m_OriginalName: - m_EditFieldRect: - serializedVersion: 2 - x: 0 - y: 0 - width: 0 - height: 0 - m_UserData: 0 - m_IsWaitingForDelay: 0 - m_IsRenaming: 0 - m_OriginalEventType: 11 - m_IsRenamingFilename: 0 - m_ClientGUIView: {fileID: 0} - m_SearchString: ---- !u!114 &21 +--- !u!114 &13 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -572,8 +332,8 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: -30675 - y: -31970 + x: 1325 + y: 73 width: 683 height: 449 m_SerializedDataModeController: @@ -651,7 +411,7 @@ MonoBehaviour: m_XRRenderMode: 0 m_RenderTexture: {fileID: 0} m_showToolbar: 1 ---- !u!114 &22 +--- !u!114 &14 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -671,8 +431,8 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: -32000 - y: -31970 + x: 0 + y: 73 width: 448 height: 449 m_SerializedDataModeController: @@ -688,9 +448,9 @@ MonoBehaviour: m_SceneHierarchy: m_TreeViewState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: ea580000 + m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 12fbffff + m_ExpandedIDs: 1a17faffc817faff621ffaffa421fafff051fbffcc6c0400 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -706,7 +466,7 @@ MonoBehaviour: m_IsRenaming: 0 m_OriginalEventType: 11 m_IsRenamingFilename: 0 - m_ClientGUIView: {fileID: 14} + m_ClientGUIView: {fileID: 8} m_SearchString: m_ExpandedScenes: [] m_CurrenRootInstanceID: 0 @@ -714,7 +474,7 @@ MonoBehaviour: m_IsLocked: 0 m_CurrentSortingName: TransformSorting m_WindowGUID: 4c969a2b90040154d917609493e03593 ---- !u!114 &23 +--- !u!114 &15 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -734,8 +494,8 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: -31551 - y: -31970 + x: 449 + y: 73 width: 874 height: 449 m_SerializedDataModeController: @@ -1169,7 +929,7 @@ MonoBehaviour: m_OverrideSceneCullingMask: 6917529027641081856 m_SceneIsLit: 0 m_SceneLighting: 1 - m_2DMode: 0 + m_2DMode: 1 m_isRotationLocked: 0 m_PlayAudio: 0 m_AudioPlay: 0 @@ -1222,17 +982,17 @@ MonoBehaviour: m_GridAxis: 1 m_gridOpacity: 0.5 m_Rotation: - m_Target: {x: -0.06816971, y: 0.5644318, z: -0.046847474, w: -0.8213268} + m_Target: {x: 0, y: 0, z: 0, w: 1} speed: 2 - m_Value: {x: -0.06816962, y: 0.5644311, z: -0.046847414, w: -0.8213257} + m_Value: {x: 0, y: 0, z: 0, w: 1} m_Size: m_Target: 77.009224 speed: 2 m_Value: 77.009224 m_Ortho: - m_Target: 0 + m_Target: 1 speed: 2 - m_Value: 0 + m_Value: 1 m_CameraSettings: m_Speed: 0.70065 m_SpeedNormalized: 0.35 @@ -1253,7 +1013,7 @@ MonoBehaviour: m_SceneVisActive: 1 m_LastLockedObject: {fileID: 0} m_ViewIsLockedToObject: 0 ---- !u!114 &24 +--- !u!114 &16 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -1287,7 +1047,7 @@ MonoBehaviour: m_LastAppliedPresetName: Default m_SaveData: [] m_OverlaysVisible: 1 ---- !u!114 &25 +--- !u!114 &17 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -4493,7 +4253,7 @@ MonoBehaviour: }\n}\n\n" m_AssetMaybeChangedOnDisk: 1 m_AssetMaybeDeleted: 0 ---- !u!114 &26 +--- !u!114 &18 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -4563,7 +4323,7 @@ MonoBehaviour: m_CurrentEditor: 1 m_LayerEditor: m_SelectedLayerIndex: 0 ---- !u!114 &27 +--- !u!114 &19 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -4608,7 +4368,7 @@ MonoBehaviour: m_SkipHidden: 0 m_SearchArea: 1 m_Folders: - - Assets/Plugins/Android + - Assets/_MagicCaptainService/Scripts m_Globs: [] m_OriginalText: m_ImportLogFlags: 0 @@ -4616,16 +4376,16 @@ MonoBehaviour: m_ViewMode: 1 m_StartGridSize: 16 m_LastFolders: - - Assets/Plugins/Android + - Assets/_MagicCaptainService/Scripts m_LastFoldersGridSize: 16 - m_LastProjectPath: F:\source\MagicCaptainService + m_LastProjectPath: F:\source\PineappleTech\MagicCaptainService m_LockTracker: m_IsLocked: 0 m_FolderTreeState: - scrollPos: {x: 0, y: 40} - m_SelectedIDs: 6ca40000 - m_LastClickedID: 42092 - m_ExpandedIDs: 000000009aa100009ca100009ea1000056a4000000ca9a3b + scrollPos: {x: 0, y: 0} + m_SelectedIDs: 56440000 + m_LastClickedID: 17494 + m_ExpandedIDs: 000000006a410000e641000000ca9a3b m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -4641,7 +4401,7 @@ MonoBehaviour: m_IsRenaming: 0 m_OriginalEventType: 11 m_IsRenamingFilename: 1 - m_ClientGUIView: {fileID: 17} + m_ClientGUIView: {fileID: 11} m_SearchString: m_CreateAssetUtility: m_EndAction: {fileID: 0} @@ -4653,7 +4413,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 000000009aa100009ca100009ea10000 + m_ExpandedIDs: m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -4678,26 +4438,26 @@ MonoBehaviour: m_Icon: {fileID: 0} m_ResourceFile: m_ListAreaState: - m_SelectedInstanceIDs: ea580000 - m_LastClickedInstanceID: 22762 - m_HadKeyboardFocusLastEvent: 1 + m_SelectedInstanceIDs: + m_LastClickedInstanceID: 0 + m_HadKeyboardFocusLastEvent: 0 m_ExpandedInstanceIDs: c623000040c000003ccd00005ccc0000f8cb0000d0cb0000e4cb000098cc000048cc000020cc000084cc0000fccc0000e8cc000034cc000028cd0000d4cc0000accc00003ec70000c8c600003ee1000078e0000002e1000004ef000090ef0000dae00000f6ee000054be0000bebe000048be00000a9500008ec90000b0c6000034d50000d4ab0000d2ab0000c4ab0000f8e2000078b500006aba000016ba000066080100a02b0100a22b010042e30000b8e30000e0e30000c0e40000c4bf0000d2e100000000000016c2000090200100ca8b0100c08b01004c920000 m_RenameOverlay: m_UserAcceptedRename: 0 - m_Name: Main - m_OriginalName: Main + m_Name: + m_OriginalName: m_EditFieldRect: serializedVersion: 2 x: 0 y: 0 width: 0 height: 0 - m_UserData: 22762 + m_UserData: 0 m_IsWaitingForDelay: 0 m_IsRenaming: 0 - m_OriginalEventType: 0 + m_OriginalEventType: 11 m_IsRenamingFilename: 1 - m_ClientGUIView: {fileID: 17} + m_ClientGUIView: {fileID: 11} m_CreateAssetUtility: m_EndAction: {fileID: 0} m_InstanceID: 0 @@ -4709,7 +4469,7 @@ MonoBehaviour: m_GridSize: 16 m_SkipHiddenPackages: 0 m_DirectoriesAreaWidth: 338 ---- !u!114 &28 +--- !u!114 &20 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -4729,8 +4489,8 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: -32000 - y: -31500 + x: 0 + y: 543 width: 2009 height: 448 m_SerializedDataModeController: @@ -4743,7 +4503,7 @@ MonoBehaviour: m_LastAppliedPresetName: Default m_SaveData: [] m_OverlaysVisible: 1 ---- !u!114 &29 +--- !u!114 &21 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -4780,7 +4540,7 @@ MonoBehaviour: m_LockTracker: m_IsLocked: 0 m_LastSelectedObjectID: -8984 ---- !u!114 &30 +--- !u!114 &22 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -4837,7 +4597,7 @@ MonoBehaviour: m_IsRenamingFilename: 0 m_ClientGUIView: {fileID: 0} m_SearchString: ---- !u!114 &31 +--- !u!114 &23 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -4857,8 +4617,8 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: -29990 - y: -31970 + x: 2010 + y: 73 width: 549 height: 918 m_SerializedDataModeController: @@ -4884,7 +4644,7 @@ MonoBehaviour: m_LockTracker: m_IsLocked: 0 m_PreviewWindow: {fileID: 0} ---- !u!114 &32 +--- !u!114 &24 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -4918,7 +4678,7 @@ MonoBehaviour: m_LastAppliedPresetName: Default m_SaveData: [] m_OverlaysVisible: 1 ---- !u!114 &33 +--- !u!114 &25 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0}