diff --git a/.gitignore b/.gitignore index 73ef4c9f0..085cfabde 100644 --- a/.gitignore +++ b/.gitignore @@ -21,3 +21,4 @@ QFramework.Unity2018+/Assets/Plugins/Editor/JetBrains/ QFramework.Unity2018+/AssetBundles/ QFramework.Unity2018+/Assets/StreamingAssets/AssetBundles/ QFramework.Unity2018+/Assets/StreamingAssets/AssetBundles.meta +.DS_Store diff --git a/QFramework.Toolkits.unitypackage b/QFramework.Toolkits.unitypackage index 83193d752..745d15d5e 100644 Binary files a/QFramework.Toolkits.unitypackage and b/QFramework.Toolkits.unitypackage differ diff --git a/QFramework.Unity2018+/Assets/Plugins.meta b/QFramework.Unity2018+/Assets/Plugins.meta deleted file mode 100644 index 4b092a546..000000000 --- a/QFramework.Unity2018+/Assets/Plugins.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 05a74be8f441c454eb2457859540db6b -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/QFramework.Unity2018+/Assets/QFramework/Framework/Examples/7.PointPointPoint/Scripts/Game/Enemy.cs b/QFramework.Unity2018+/Assets/QFramework/Framework/Examples/7.PointPointPoint/Scripts/Game/Enemy.cs index 26429f69b..deadb07af 100755 --- a/QFramework.Unity2018+/Assets/QFramework/Framework/Examples/7.PointPointPoint/Scripts/Game/Enemy.cs +++ b/QFramework.Unity2018+/Assets/QFramework/Framework/Examples/7.PointPointPoint/Scripts/Game/Enemy.cs @@ -4,7 +4,6 @@ namespace QFramework.PointGame { public class Enemy : MonoBehaviour,IController { - private void OnMouseDown() { gameObject.SetActive(false); diff --git a/QFramework.Unity2018+/Assets/QFramework/Framework/PackageVersion.json b/QFramework.Unity2018+/Assets/QFramework/Framework/PackageVersion.json index e9bcbbe14..4147772f8 100755 --- a/QFramework.Unity2018+/Assets/QFramework/Framework/PackageVersion.json +++ b/QFramework.Unity2018+/Assets/QFramework/Framework/PackageVersion.json @@ -1,6 +1,6 @@ { "Id": "", - "Version": "v1.0.60", + "Version": "v1.0.69", "Type": 0, "AccessRight": 0, "DownloadUrl": "", @@ -11,10 +11,10 @@ ], "DocUrl": "https://liangxiegame.com", "Readme": { - "version": "v1.0.60", - "content": "修复 UniRx&Tween Action 的报错问题", + "version": "v1.0.69", + "content": "CodeGenKit 修复 Prefab 报错的问题", "author": "liangxie", - "date": "2023 年 06 月 17 日 12:59", + "date": "2023 年 07 月 08 日 12:43", "PackageId": "" } } \ No newline at end of file diff --git a/QFramework.Unity2018+/Assets/QFramework/Toolkits/AudioKit/Example.meta b/QFramework.Unity2018+/Assets/QFramework/Toolkits/AudioKit/Example.meta deleted file mode 100755 index 9ea9ff5c8..000000000 --- a/QFramework.Unity2018+/Assets/QFramework/Toolkits/AudioKit/Example.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 65cb5437453d140fcb82e06b4ed474ae -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/QFramework.Unity2018+/Assets/QFramework/Toolkits/AudioKit/Example.unitypackage b/QFramework.Unity2018+/Assets/QFramework/Toolkits/AudioKit/Example.unitypackage new file mode 100644 index 000000000..ae489ab76 Binary files /dev/null and b/QFramework.Unity2018+/Assets/QFramework/Toolkits/AudioKit/Example.unitypackage differ diff --git a/QFramework.Unity2018+/Assets/QFramework/Toolkits/AudioKit/Example.unitypackage.meta b/QFramework.Unity2018+/Assets/QFramework/Toolkits/AudioKit/Example.unitypackage.meta new file mode 100644 index 000000000..650fdeb0e --- /dev/null +++ b/QFramework.Unity2018+/Assets/QFramework/Toolkits/AudioKit/Example.unitypackage.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 1fae029c3eecbe44ea3ff0b493f20601 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/QFramework.Unity2018+/Assets/QFramework/Toolkits/AudioKit/Example/0.Basic.meta b/QFramework.Unity2018+/Assets/QFramework/Toolkits/AudioKit/Example/0.Basic.meta deleted file mode 100755 index ce07b804b..000000000 --- a/QFramework.Unity2018+/Assets/QFramework/Toolkits/AudioKit/Example/0.Basic.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 871d63d506a7acb4e9db24c494a90771 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/QFramework.Unity2018+/Assets/QFramework/Toolkits/AudioKit/Example/0.Basic/AudioExample.cs b/QFramework.Unity2018+/Assets/QFramework/Toolkits/AudioKit/Example/0.Basic/AudioExample.cs deleted file mode 100755 index e95053178..000000000 --- a/QFramework.Unity2018+/Assets/QFramework/Toolkits/AudioKit/Example/0.Basic/AudioExample.cs +++ /dev/null @@ -1,63 +0,0 @@ -using UnityEngine; -using UnityEngine.UI; - -namespace QFramework.Example -{ - public class AudioExample : MonoBehaviour - { - private void Awake() - { - var btnPlayHome = transform.Find("BtnPlayHome").GetComponent