Merge branch 'master' of http://192.168.31.100:8088/framework/xosmopluginlibrary

# Conflicts: # Assets/07.RKVoiceCommand/RunTime/IVoiceCommandSystem.cs # Assets/07.RKVoiceCommand/RunTime/VoiceCommandController.cs # Assets/07.RKVoiceCommand/package.json
2025-04-18 11:22:27 +08:00
parent 68e1273792 8c5c2580c4
commit 8a6cca7be1
32 changed files with 368 additions and 199 deletions
--- a/Assets/07.RKVoiceCommand/RunTime/IVoiceCommandSystem.cs.meta
+++ b/Assets/07.RKVoiceCommand/RunTime/IVoiceCommandSystem.cs.meta
@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: 073d8fadbb202ad42a540fd5299555c3
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/07.RKVoiceCommand/RunTime/RKVoiceCommand.RunTime.asmdef
+++ b/Assets/07.RKVoiceCommand/RunTime/RKVoiceCommand.RunTime.asmdef
@@ -1,18 +0,0 @@
-{
-    "name": "RKVoiceCommand.RunTime",
-    "rootNamespace": "",
-    "references": [
-        "GUID:6447e10b87dc140ab924878c1ecef665",
-        "GUID:fe14bc9dd681249d19cf4ef377c7e29e",
-        "GUID:d1a793c2b6959e04ea45b972eaa369c8"
-    ],
-    "includePlatforms": [],
-    "excludePlatforms": [],
-    "allowUnsafeCode": false,
-    "overrideReferences": false,
-    "precompiledReferences": [],
-    "autoReferenced": true,
-    "defineConstraints": [],
-    "versionDefines": [],
-    "noEngineReferences": false
-}
--- a/Assets/07.RKVoiceCommand/RunTime/RKVoiceCommand.RunTime.asmdef.meta
+++ b/Assets/07.RKVoiceCommand/RunTime/RKVoiceCommand.RunTime.asmdef.meta
@@ -1,13 +0,0 @@
-fileFormatVersion: 2
-<<<<<<<< HEAD:Assets/05.TableTextConversion/Editor/Excel.meta
-guid: 10c9b58b77ad42b4193e2a393b1a9899
-folderAsset: yes
-DefaultImporter:
-========
-guid: 44e8639d57fc2a94b94ecef44bf1e36a
-AssemblyDefinitionImporter:
->>>>>>>> 04.AudioCore:Assets/04.AudioCore/RunTime/AudioCore.RunTime.asmdef.meta
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/07.RKVoiceCommand/RunTime/VoiceCommandController.cs.meta
+++ b/Assets/07.RKVoiceCommand/RunTime/VoiceCommandController.cs.meta
@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: 9f55b7179dceeae47826f4f0f08ba3fd
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: