v0.11.57 KeyEventAction 找回

liangxiegame · Mar 3, 2021 · 905092e · 905092e
1 parent 974b50b
commit 905092e
Show file tree

Hide file tree

Showing 53 changed files with 799 additions and 504 deletions.
diff --git a/QFramework/QFramework.Unity.Runtime/ActionKit/Timeline/KeyEventAction.cs b/QFramework/QFramework.Unity.Runtime/ActionKit/Timeline/KeyEventAction.cs
@@ -0,0 +1,66 @@
+/****************************************************************************
+ * Copyright (c) 2021.3 liangxie
+ * 
+ * https://qframework.cn
+ * https://github.com/liangxiegame/QFramework
+ * https://gitee.com/liangxiegame/QFramework
+ * 
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ * 
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ ****************************************************************************/
+
+namespace QFramework
+{
+    public class KeyEventAction : ActionKitAction, IPoolable
+    {
+        private Timeline mTimeline;
+        private string mEventName;
+
+        public static KeyEventAction Allocate(string eventName, Timeline timeline)
+        {
+            var keyEventAction = SafeObjectPool<KeyEventAction>.Instance.Allocate();
+
+            keyEventAction.mEventName = eventName;
+            keyEventAction.mTimeline = timeline;
+
+            return keyEventAction;
+        }
+
+        protected override void OnBegin()
+        {
+            base.OnBegin();
+
+            mTimeline.OnKeyEventsReceivedCallback.InvokeGracefully(mEventName);
+
+            Finish();
+        }
+
+        protected override void OnDispose()
+        {
+            SafeObjectPool<KeyEventAction>.Instance.Recycle(this);
+        }
+
+        public void OnRecycled()
+        {
+            mTimeline = null;
+            mEventName = null;
+        }
+
+        public bool IsRecycled { get; set; }
+    }
+}
diff --git a/QFramework/QFramework.Unity.Runtime/Core/CSharpExtension/MaterialExtensions.cs b/QFramework/QFramework.Unity.Runtime/Core/CSharpExtension/MaterialExtensions.cs
@@ -0,0 +1,49 @@
+/****************************************************************************
+ * Copyright (c) 2017 ~ 2021.3 liangxie
+ * 
+ * https://qframework.cn
+ * https://github.com/liangxiegame/QFramework
+ * https://gitee.com/liangxiegame/QFramework
+ * 
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ * 
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ ****************************************************************************/
+
+using UnityEngine;
+
+namespace QFramework
+{
+    public static class MaterialExtensions
+    {
+        /// <summary>
+        /// 参考资料: https://blog.csdn.net/qiminixi/article/details/78402505
+        /// </summary>
+        /// <param name="self"></param>
+        public static void SetStandardMaterialToTransparentMode(this Material self)
+        {
+            self.SetFloat("_Mode", 3);
+            self.SetInt("_SrcBlend", (int)UnityEngine.Rendering.BlendMode.SrcAlpha);
+            self.SetInt("_DstBlend", (int)UnityEngine.Rendering.BlendMode.OneMinusSrcAlpha);
+            self.SetInt("_ZWrite", 0);
+            self.DisableKeyword("_ALPHATEST_ON");
+            self.EnableKeyword("_ALPHABLEND_ON");
+            self.DisableKeyword("_ALPHAPREMULTIPLY_ON");
+            self.renderQueue = 3000;
+        }
+    }
+}
diff --git a/QFramework/QFramework.Unity.Runtime/Core/CSharpExtension/QFramework.CSharpExtension.cs b/QFramework/QFramework.Unity.Runtime/Core/CSharpExtension/QFramework.CSharpExtension.cs
@@ -2591,22 +2591,5 @@ public static T GetRandomWithPower<T>(this Dictionary<T, int> powersDict)
 
     }
 
-    public static class MaterialExtensions
-    {
-        /// <summary>
-        /// 参考资料: https://blog.csdn.net/qiminixi/article/details/78402505
-        /// </summary>
-        /// <param name="self"></param>
-        public static void SetStandardMaterialToTransparentMode(this Material self)
-        {
-            self.SetFloat("_Mode", 3);
-            self.SetInt("_SrcBlend", (int)UnityEngine.Rendering.BlendMode.SrcAlpha);
-            self.SetInt("_DstBlend", (int)UnityEngine.Rendering.BlendMode.OneMinusSrcAlpha);
-            self.SetInt("_ZWrite", 0);
-            self.DisableKeyword("_ALPHATEST_ON");
-            self.EnableKeyword("_ALPHABLEND_ON");
-            self.DisableKeyword("_ALPHAPREMULTIPLY_ON");
-            self.renderQueue = 3000;
-        }
-    }
+
 }
diff --git a/QFramework/QFramework.Unity.Runtime/Core/CSharpExtension/TextureExtensions.cs b/QFramework/QFramework.Unity.Runtime/Core/CSharpExtension/TextureExtensions.cs
@@ -0,0 +1,38 @@
+/****************************************************************************
+ * Copyright (c) 2021.3 liangxie
+ * 
+ * https://qframework.cn
+ * https://github.com/liangxiegame/QFramework
+ * https://gitee.com/liangxiegame/QFramework
+ * 
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ * 
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ ****************************************************************************/
+
+using UnityEngine;
+
+namespace QFramework
+{
+    public static class TextureExtensions
+    {
+        public static Sprite CreateSprite(this Texture2D self)
+        {
+            return Sprite.Create(self, new Rect(0, 0, self.width, self.height), Vector2.one * 0.5f);
+        }
+    }
+}
diff --git a/QFramework/QFramework.Unity.Runtime/QFramework.Unity.Runtime.csproj b/QFramework/QFramework.Unity.Runtime/QFramework.Unity.Runtime.csproj
@@ -99,6 +99,7 @@
         <Compile Include="ActionKit\Pro\Framework\ActionTypeDB.cs" />
         <Compile Include="ActionKit\Pro\Framework\Event\ActionKitEvent.cs" />
         <Compile Include="ActionKit\QFramework.ActionKit.FSM.cs" />
+        <Compile Include="ActionKit\Timeline\KeyEventAction.cs" />
         <Compile Include="ActionKit\Timeline\Timeline.cs" />
         <Compile Include="AudioKit\0.Timer\BinaryHeap.cs" />
         <Compile Include="AudioKit\0.Timer\IBinaryHeapElement.cs" />
@@ -163,7 +164,9 @@
         <Compile Include="Core\CodeGen\ViewController.cs" />
         <Compile Include="Core\CodeGen\Writer\FileCodeWriter.cs" />
         <Compile Include="Core\CodeGen\Writer\ICodeWriter.cs" />
+        <Compile Include="Core\CSharpExtension\MaterialExtensions.cs" />
         <Compile Include="Core\CSharpExtension\QFramework.CSharpExtension.cs" />
+        <Compile Include="Core\CSharpExtension\TextureExtensions.cs" />
         <Compile Include="Core\Disposable\CustomDisposable.cs" />
         <Compile Include="Core\Disposable\DisposableList.cs" />
         <Compile Include="Core\Disposable\IDisposableList.cs" />
@@ -277,6 +280,7 @@
         <Compile Include="ResKit\ResourcesSupport\ResourcesRes.cs" />
         <Compile Include="ResKit\ResourcesSupport\ResourcesResCreator.cs" />
         <Compile Include="ResKit\ResSearchKeys.cs" />
+        <Compile Include="ResKit\ResUnloadHelper.cs" />
         <Compile Include="UIKit\ActionKitSupport\UIKitClosePanel.cs" />
         <Compile Include="UIKit\ActionKitSupport\UIKitOpenPanel.cs" />
         <Compile Include="UIKit\ActionKitSupport\UIKitSetResolution.cs" />