diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..4fa61c0 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,15 @@ +[submodule "Unity-19050-05-BallPool/Packages/com.ultracombos.chwan1"] + path = Unity-19050-05-BallPool/Packages/com.ultracombos.chwan1 + url = https://github.com/UltraCombos/com.ultracombos.chwan1 +[submodule "_Package/com.ultracombos.utility"] + path = _Package/com.ultracombos.utility + url = https://github.com/UltraCombos/com.ultracombos.utility +[submodule "_Package/com.ultracombos.generic-grpc"] + path = _Package/com.ultracombos.generic-grpc + url = https://github.com/UltraCombos/com.ultracombos.generic-grpc +[submodule "_Package/com.ultracombos.grpc"] + path = _Package/com.ultracombos.grpc + url = https://github.com/UltraCombos/com.ultracombos.grpc +[submodule "_Package/com.ultracombos.movie-player"] + path = _Package/com.ultracombos.movie-player + url = https://github.com/UltraCombos/com.ultracombos.movie-player diff --git a/Unity-19050-05-BallPool/Assets/Frozen/Script/SceneController.cs b/Unity-19050-05-BallPool/Assets/Frozen/Script/SceneController.cs index ef86bbe..0dbb650 100644 --- a/Unity-19050-05-BallPool/Assets/Frozen/Script/SceneController.cs +++ b/Unity-19050-05-BallPool/Assets/Frozen/Script/SceneController.cs @@ -2,6 +2,7 @@ using System.Collections.Generic; using UnityEngine; using UnityEngine.Events; +using UltraCombos.Utility; namespace UltraCombos.Frozen { diff --git a/Unity-19050-05-BallPool/Assets/Grpc.meta b/Unity-19050-05-BallPool/Assets/Grpc.meta deleted file mode 100644 index 05868e6..0000000 --- a/Unity-19050-05-BallPool/Assets/Grpc.meta +++ /dev/null @@ -1,10 +0,0 @@ -fileFormatVersion: 2 -guid: 6f6b5b47aa125be4aa9abe68fcf892ac -folderAsset: yes -timeCreated: 1525257095 -licenseType: Free -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Unity-19050-05-BallPool/Assets/Grpc/Plugins.meta b/Unity-19050-05-BallPool/Assets/Grpc/Plugins.meta deleted file mode 100644 index 82b06e6..0000000 --- a/Unity-19050-05-BallPool/Assets/Grpc/Plugins.meta +++ /dev/null @@ -1,10 +0,0 @@ -fileFormatVersion: 2 -guid: d0bdbcbef356b804d884dd930d38ae8b -folderAsset: yes -timeCreated: 1518015320 -licenseType: Free -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Unity-19050-05-BallPool/Assets/Grpc/Plugins/Google.Protobuf.dll b/Unity-19050-05-BallPool/Assets/Grpc/Plugins/Google.Protobuf.dll deleted file mode 100644 index e1f3cff..0000000 Binary files a/Unity-19050-05-BallPool/Assets/Grpc/Plugins/Google.Protobuf.dll and /dev/null differ diff --git a/Unity-19050-05-BallPool/Assets/Grpc/Plugins/Google.Protobuf.dll.meta b/Unity-19050-05-BallPool/Assets/Grpc/Plugins/Google.Protobuf.dll.meta deleted file mode 100644 index ef41a9d..0000000 --- a/Unity-19050-05-BallPool/Assets/Grpc/Plugins/Google.Protobuf.dll.meta +++ /dev/null @@ -1,32 +0,0 @@ -fileFormatVersion: 2 -guid: 9504153c153a2624e9da519e92cf5542 -timeCreated: 1518015297 -licenseType: Free -PluginImporter: - externalObjects: {} - serializedVersion: 2 - iconMap: {} - executionOrder: {} - isPreloaded: 0 - isOverridable: 0 - platformData: - - first: - Any: - second: - enabled: 1 - settings: {} - - first: - Editor: Editor - second: - enabled: 0 - settings: - DefaultValueInitialized: true - - first: - Windows Store Apps: WindowsStoreApps - second: - enabled: 0 - settings: - CPU: AnyCPU - userData: - assetBundleName: - assetBundleVariant: diff --git a/Unity-19050-05-BallPool/Assets/Grpc/Plugins/Grpc.Core.dll b/Unity-19050-05-BallPool/Assets/Grpc/Plugins/Grpc.Core.dll deleted file mode 100644 index 48d134c..0000000 Binary files a/Unity-19050-05-BallPool/Assets/Grpc/Plugins/Grpc.Core.dll and /dev/null differ diff --git a/Unity-19050-05-BallPool/Assets/Grpc/Plugins/Grpc.Core.dll.meta b/Unity-19050-05-BallPool/Assets/Grpc/Plugins/Grpc.Core.dll.meta deleted file mode 100644 index 1b78f7a..0000000 --- a/Unity-19050-05-BallPool/Assets/Grpc/Plugins/Grpc.Core.dll.meta +++ /dev/null @@ -1,30 +0,0 @@ -fileFormatVersion: 2 -guid: dbf1aea72c6b57649b8bfb462b093c00 -PluginImporter: - externalObjects: {} - serializedVersion: 2 - iconMap: {} - executionOrder: {} - isPreloaded: 0 - isOverridable: 0 - platformData: - - first: - Any: - second: - enabled: 1 - settings: {} - - first: - Editor: Editor - second: - enabled: 0 - settings: - DefaultValueInitialized: true - - first: - Windows Store Apps: WindowsStoreApps - second: - enabled: 0 - settings: - CPU: AnyCPU - userData: - assetBundleName: - assetBundleVariant: diff --git a/Unity-19050-05-BallPool/Assets/Grpc/Plugins/System.Interactive.Async.dll b/Unity-19050-05-BallPool/Assets/Grpc/Plugins/System.Interactive.Async.dll deleted file mode 100644 index 48efea4..0000000 Binary files a/Unity-19050-05-BallPool/Assets/Grpc/Plugins/System.Interactive.Async.dll and /dev/null differ diff --git a/Unity-19050-05-BallPool/Assets/Grpc/Plugins/System.Interactive.Async.dll.meta b/Unity-19050-05-BallPool/Assets/Grpc/Plugins/System.Interactive.Async.dll.meta deleted file mode 100644 index 6b19559..0000000 --- a/Unity-19050-05-BallPool/Assets/Grpc/Plugins/System.Interactive.Async.dll.meta +++ /dev/null @@ -1,30 +0,0 @@ -fileFormatVersion: 2 -guid: 495e81e1d71d1314bb494527410dccb0 -PluginImporter: - externalObjects: {} - serializedVersion: 2 - iconMap: {} - executionOrder: {} - isPreloaded: 0 - isOverridable: 0 - platformData: - - first: - Any: - second: - enabled: 1 - settings: {} - - first: - Editor: Editor - second: - enabled: 0 - settings: - DefaultValueInitialized: true - - first: - Windows Store Apps: WindowsStoreApps - second: - enabled: 0 - settings: - CPU: AnyCPU - userData: - assetBundleName: - assetBundleVariant: diff --git a/Unity-19050-05-BallPool/Assets/Grpc/Plugins/runtimes.meta b/Unity-19050-05-BallPool/Assets/Grpc/Plugins/runtimes.meta deleted file mode 100644 index a32a420..0000000 --- a/Unity-19050-05-BallPool/Assets/Grpc/Plugins/runtimes.meta +++ /dev/null @@ -1,10 +0,0 @@ -fileFormatVersion: 2 -guid: 1152917cc2daa11438d537680ad5f9d4 -folderAsset: yes -timeCreated: 1518001842 -licenseType: Free -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Unity-19050-05-BallPool/Assets/Grpc/Plugins/runtimes/win.meta b/Unity-19050-05-BallPool/Assets/Grpc/Plugins/runtimes/win.meta deleted file mode 100644 index 1af9bcb..0000000 --- a/Unity-19050-05-BallPool/Assets/Grpc/Plugins/runtimes/win.meta +++ /dev/null @@ -1,10 +0,0 @@ -fileFormatVersion: 2 -guid: dfc7c55cf51ee0b489c4b8f996fa221a -folderAsset: yes -timeCreated: 1517972283 -licenseType: Free -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Unity-19050-05-BallPool/Assets/Grpc/Plugins/runtimes/win/native.meta b/Unity-19050-05-BallPool/Assets/Grpc/Plugins/runtimes/win/native.meta deleted file mode 100644 index d3435ff..0000000 --- a/Unity-19050-05-BallPool/Assets/Grpc/Plugins/runtimes/win/native.meta +++ /dev/null @@ -1,10 +0,0 @@ -fileFormatVersion: 2 -guid: 9d801733b0f4ed842a4226da283a9575 -folderAsset: yes -timeCreated: 1518001790 -licenseType: Free -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Unity-19050-05-BallPool/Assets/Grpc/Plugins/runtimes/win/native/grpc_csharp_ext.dll b/Unity-19050-05-BallPool/Assets/Grpc/Plugins/runtimes/win/native/grpc_csharp_ext.dll deleted file mode 100644 index 8d0845e..0000000 Binary files a/Unity-19050-05-BallPool/Assets/Grpc/Plugins/runtimes/win/native/grpc_csharp_ext.dll and /dev/null differ diff --git a/Unity-19050-05-BallPool/Assets/Grpc/Plugins/runtimes/win/native/grpc_csharp_ext.dll.meta b/Unity-19050-05-BallPool/Assets/Grpc/Plugins/runtimes/win/native/grpc_csharp_ext.dll.meta deleted file mode 100644 index 94d556c..0000000 --- a/Unity-19050-05-BallPool/Assets/Grpc/Plugins/runtimes/win/native/grpc_csharp_ext.dll.meta +++ /dev/null @@ -1,88 +0,0 @@ -fileFormatVersion: 2 -guid: c45a46b26d79cea4bbe365f12000d367 -timeCreated: 1518001685 -licenseType: Free -PluginImporter: - externalObjects: {} - serializedVersion: 2 - iconMap: {} - executionOrder: {} - isPreloaded: 0 - isOverridable: 0 - platformData: - - first: - '': Any - second: - enabled: 0 - settings: - Exclude Editor: 0 - Exclude Linux: 0 - Exclude Linux64: 0 - Exclude LinuxUniversal: 0 - Exclude OSXUniversal: 0 - Exclude Win: 1 - Exclude Win64: 0 - - first: - Any: - second: - enabled: 1 - settings: {} - - first: - Editor: Editor - second: - enabled: 1 - settings: - CPU: x86_64 - DefaultValueInitialized: true - OS: Windows - - first: - Facebook: Win - second: - enabled: 0 - settings: - CPU: None - - first: - Facebook: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Linux - second: - enabled: 1 - settings: - CPU: x86 - - first: - Standalone: Linux64 - second: - enabled: 1 - settings: - CPU: x86_64 - - first: - Standalone: LinuxUniversal - second: - enabled: 1 - settings: - CPU: AnyCPU - - first: - Standalone: OSXUniversal - second: - enabled: 1 - settings: - CPU: AnyCPU - - first: - Standalone: Win - second: - enabled: 0 - settings: - CPU: None - - first: - Standalone: Win64 - second: - enabled: 1 - settings: - CPU: AnyCPU - userData: - assetBundleName: - assetBundleVariant: diff --git a/Unity-19050-05-BallPool/Assets/Grpc/Script.meta b/Unity-19050-05-BallPool/Assets/Grpc/Script.meta deleted file mode 100644 index 21a96c2..0000000 --- a/Unity-19050-05-BallPool/Assets/Grpc/Script.meta +++ /dev/null @@ -1,10 +0,0 @@ -fileFormatVersion: 2 -guid: e61dbedb9243085418be7e788fc4b7d7 -folderAsset: yes -timeCreated: 1518408269 -licenseType: Free -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Unity-19050-05-BallPool/Assets/Grpc/Script/Editor.meta b/Unity-19050-05-BallPool/Assets/Grpc/Script/Editor.meta deleted file mode 100644 index 632318f..0000000 --- a/Unity-19050-05-BallPool/Assets/Grpc/Script/Editor.meta +++ /dev/null @@ -1,10 +0,0 @@ -fileFormatVersion: 2 -guid: 069493b6cf88a674b8ea05d8ce5ede27 -folderAsset: yes -timeCreated: 1518162534 -licenseType: Free -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Unity-19050-05-BallPool/Assets/Grpc/Script/Editor/GrpcBuildPostProcess.cs b/Unity-19050-05-BallPool/Assets/Grpc/Script/Editor/GrpcBuildPostProcess.cs deleted file mode 100644 index e4fa2f3..0000000 --- a/Unity-19050-05-BallPool/Assets/Grpc/Script/Editor/GrpcBuildPostProcess.cs +++ /dev/null @@ -1,61 +0,0 @@ -using UnityEngine; -using UnityEditor; -using UnityEditor.Callbacks; -using System.IO; -using System.Collections; -#if UNITY_EDITOR_OSX -using UnityEditor.iOS.Xcode; - -public class GrpcBuildPostProcess -{ - - [PostProcessBuild] - public static void OnPostprocessBuild(BuildTarget buildTarget, string path) - { - if (buildTarget == BuildTarget.iOS) - { - /* .xcodeproj/project.pbxproj */ - - //Get path to the PBX project - string projPath = path + "/Unity-iPhone.xcodeproj/project.pbxproj"; - - //Read the pbx project - PBXProject proj = new PBXProject(); - proj.ReadFromString(File.ReadAllText(projPath)); - - //Get the build target - string target = proj.TargetGuidByName("Unity-iPhone"); - - //set ENABLE_BITCODE to false (this shouldn't be required in Unity 5.2+) - proj.SetBuildProperty(target, "ENABLE_BITCODE", "No"); - - //Add libz.dylib - string name = proj.AddFile("/usr/lib/libz.dylib", "Frameworks/libz.dylib", PBXSourceTree.Source); - proj.AddFileToBuild(target, name); - //proj.AddFrameworkToProject(target, "/usr/lib/libz.dylib", false); - - //Write back out the PBX project - File.WriteAllText(projPath, proj.WriteToString()); - - /* Info.plist */ - - // Read the Info.plist file - string plistPath = path + "/Info.plist"; - PlistDocument plist = new PlistDocument(); - plist.ReadFromString(File.ReadAllText(plistPath)); - - // Get root of plist - PlistElementDict rootDict = plist.root; - //Set Requires full screen = true. This was needed only with Xcode 9. - rootDict.SetBoolean("UIRequiresFullScreen", true); - //Adding background modes for remote notification (For Push notifications - OneSignal) - var bgModes = rootDict.CreateArray("UIBackgroundModes"); - bgModes.AddString("remote-notification"); - - //Write out the Info.plist file - plist.WriteToFile(plistPath); - } - - } -} -#endif \ No newline at end of file diff --git a/Unity-19050-05-BallPool/Assets/Grpc/Script/Editor/GrpcBuildPostProcess.cs.meta b/Unity-19050-05-BallPool/Assets/Grpc/Script/Editor/GrpcBuildPostProcess.cs.meta deleted file mode 100644 index bd0c53b..0000000 --- a/Unity-19050-05-BallPool/Assets/Grpc/Script/Editor/GrpcBuildPostProcess.cs.meta +++ /dev/null @@ -1,13 +0,0 @@ -fileFormatVersion: 2 -guid: 2c2dc5ab2aeed034fa54b99ce7684e86 -timeCreated: 1518162353 -licenseType: Free -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Unity-19050-05-BallPool/Assets/Grpc/Script/GrpcNetworkDiscovery.cs b/Unity-19050-05-BallPool/Assets/Grpc/Script/GrpcNetworkDiscovery.cs deleted file mode 100644 index 0bce5ba..0000000 --- a/Unity-19050-05-BallPool/Assets/Grpc/Script/GrpcNetworkDiscovery.cs +++ /dev/null @@ -1,40 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; -using UnityEngine.Events; -using UnityEngine.Networking; - -namespace UltraCombos -{ - public class GrpcNetworkDiscovery : NetworkDiscovery - { - public class Config - { - public string serviceName; - public string host; - public int port; - } - - [System.Serializable] - public class MessageEvent : UnityEvent - { - } - - public MessageEvent onReceivedBroadcast = new MessageEvent(); - - private void Start() - { - Initialize(); - StartAsServer(); - } - - public override void OnReceivedBroadcast(string fromAddress, string data) - { - var config = JsonUtility.FromJson(data); - //config.host = System.Net.IPAddress.Parse(fromAddress).MapToIPv4().ToString(); - - onReceivedBroadcast.Invoke(config); - } - - } -} diff --git a/Unity-19050-05-BallPool/Assets/Grpc/Script/GrpcNetworkDiscovery.cs.meta b/Unity-19050-05-BallPool/Assets/Grpc/Script/GrpcNetworkDiscovery.cs.meta deleted file mode 100644 index ceeeddf..0000000 --- a/Unity-19050-05-BallPool/Assets/Grpc/Script/GrpcNetworkDiscovery.cs.meta +++ /dev/null @@ -1,13 +0,0 @@ -fileFormatVersion: 2 -guid: 2bd8ad095eeba3e4faab18e84e7fae76 -timeCreated: 1518487708 -licenseType: Free -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Unity-19050-05-BallPool/Assets/Material.meta b/Unity-19050-05-BallPool/Assets/Material.meta deleted file mode 100644 index 4cc885e..0000000 --- a/Unity-19050-05-BallPool/Assets/Material.meta +++ /dev/null @@ -1,10 +0,0 @@ -fileFormatVersion: 2 -guid: 19e978c6f39530b4e92e1019a575a9fc -folderAsset: yes -timeCreated: 1519716951 -licenseType: Free -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Unity-19050-05-BallPool/Assets/Material/AtmosphereSkybox.mat b/Unity-19050-05-BallPool/Assets/Material/AtmosphereSkybox.mat deleted file mode 100644 index 0b85a34..0000000 --- a/Unity-19050-05-BallPool/Assets/Material/AtmosphereSkybox.mat +++ /dev/null @@ -1,77 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!21 &2100000 -Material: - serializedVersion: 6 - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_Name: AtmosphereSkybox - m_Shader: {fileID: 4800000, guid: b5783fccd952891499da0155fe5c3887, type: 3} - m_ShaderKeywords: - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _BumpMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailAlbedoMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailMask: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailNormalMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _EmissionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MainTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MetallicGlossMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _OcclusionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _ParallaxMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Floats: - - _BumpScale: 1 - - _Cutoff: 0.5 - - _DetailNormalMapScale: 1 - - _DstBlend: 0 - - _Exposure: 1 - - _GlossMapScale: 1 - - _Glossiness: 0.5 - - _GlossyReflections: 1 - - _Metallic: 0 - - _Mode: 0 - - _OcclusionStrength: 1 - - _Parallax: 0.02 - - _SmoothnessTextureChannel: 0 - - _SpecularHighlights: 1 - - _SrcBlend: 1 - - _UVSec: 0 - - _ZWrite: 1 - m_Colors: - - _Color: {r: 1, g: 1, b: 1, a: 1} - - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} diff --git a/Unity-19050-05-BallPool/Assets/Material/AtmosphereSkybox.mat.meta b/Unity-19050-05-BallPool/Assets/Material/AtmosphereSkybox.mat.meta deleted file mode 100644 index ccd3d7a..0000000 --- a/Unity-19050-05-BallPool/Assets/Material/AtmosphereSkybox.mat.meta +++ /dev/null @@ -1,10 +0,0 @@ -fileFormatVersion: 2 -guid: d8da8ee0c05959f40b595cff10460db1 -timeCreated: 1519716963 -licenseType: Free -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 2100000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Unity-19050-05-BallPool/Assets/Shader.meta b/Unity-19050-05-BallPool/Assets/Shader.meta deleted file mode 100644 index ea36bff..0000000 --- a/Unity-19050-05-BallPool/Assets/Shader.meta +++ /dev/null @@ -1,10 +0,0 @@ -fileFormatVersion: 2 -guid: 416bc3573df8881418c8d0a173e73b9d -folderAsset: yes -timeCreated: 1519716915 -licenseType: Free -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Unity-19050-05-BallPool/Assets/Shader/AtmosphereSkybox.shader b/Unity-19050-05-BallPool/Assets/Shader/AtmosphereSkybox.shader deleted file mode 100644 index ad14a10..0000000 --- a/Unity-19050-05-BallPool/Assets/Shader/AtmosphereSkybox.shader +++ /dev/null @@ -1,177 +0,0 @@ -Shader "UltraCombos/Skybox/AtmosphereSkybox" -{ - Properties - { - _Exposure("Exposure", Range(0,10)) = 1 - } - SubShader - { - Tags{ "Queue" = "Background" "RenderType" = "Background" "PreviewType" = "Skybox" } - Cull Off ZWrite Off - - Pass - { - CGPROGRAM - #pragma vertex vert - #pragma fragment frag - - #include "UnityCG.cginc" - - struct v2f - { - float4 vertex : SV_POSITION; - float3 rayDir : TEXCOORD0; - }; - - v2f vert (appdata_base v) - { - v2f o; - UNITY_SETUP_INSTANCE_ID(v); - UNITY_INITIALIZE_VERTEX_OUTPUT_STEREO(o); - o.vertex = UnityObjectToClipPos(v.vertex); - - float3 eyeRay = normalize(mul((float3x3)unity_ObjectToWorld, v.vertex.xyz)); - o.rayDir = eyeRay; - - return o; - } - - float2 rsi(float3 r0, float3 rd, float sr) { - // ray-sphere intersection that assumes - // the sphere is centered at the origin. - // No intersection when result.x > result.y - float a = dot(rd, rd); - float b = 2.0 * dot(rd, r0); - float c = dot(r0, r0) - (sr * sr); - float d = (b*b) - 4.0*a*c; - if (d < 0.0) return float2(1e5, -1e5); - return float2( - (-b - sqrt(d)) / (2.0*a), - (-b + sqrt(d)) / (2.0*a) - ); - } - - float3 atmosphere(float3 r, float3 r0, float3 pSun, float iSun, float rPlanet, float rAtmos, - float3 kRlh, float kMie, float shRlh, float shMie, float g) - { - const int iSteps = 16; - const int jSteps = 8; - - // Normalize the sun and view directions. - pSun = normalize(pSun); - r = normalize(r); - - // Calculate the step size of the primary ray. - float2 p = rsi(r0, r, rAtmos); - if (p.x > p.y) return float3(0, 0, 0); - p.y = min(p.y, rsi(r0, r, rPlanet).x); - float iStepSize = (p.y - p.x) / float(iSteps); - - // Initialize the primary ray time. - float iTime = 0.0; - - // Initialize accumulators for Rayleigh and Mie scattering. - float3 totalRlh = float3(0, 0, 0); - float3 totalMie = float3(0, 0, 0); - - // Initialize optical depth accumulators for the primary ray. - float iOdRlh = 0.0; - float iOdMie = 0.0; - - // Calculate the Rayleigh and Mie phases. - float mu = dot(r, pSun); - float mumu = mu * mu; - float gg = g * g; - float pRlh = 3.0 / (16.0 * UNITY_PI) * (1.0 + mumu); - float pMie = 3.0 / (8.0 * UNITY_PI) * ((1.0 - gg) * (mumu + 1.0)) / (pow(1.0 + gg - 2.0 * mu * g, 1.5) * (2.0 + gg)); - - // Sample the primary ray. - for (int i = 0; i < iSteps; i++) { - - // Calculate the primary ray sample position. - float3 iPos = r0 + r * (iTime + iStepSize * 0.5); - - // Calculate the height of the sample. - float iHeight = length(iPos) - rPlanet; - - // Calculate the optical depth of the Rayleigh and Mie scattering for this step. - float odStepRlh = exp(-iHeight / shRlh) * iStepSize; - float odStepMie = exp(-iHeight / shMie) * iStepSize; - - // Accumulate optical depth. - iOdRlh += odStepRlh; - iOdMie += odStepMie; - - // Calculate the step size of the secondary ray. - float jStepSize = rsi(iPos, pSun, rAtmos).y / float(jSteps); - - // Initialize the secondary ray time. - float jTime = 0.0; - - // Initialize optical depth accumulators for the secondary ray. - float jOdRlh = 0.0; - float jOdMie = 0.0; - - // Sample the secondary ray. - for (int j = 0; j < jSteps; j++) { - - // Calculate the secondary ray sample position. - float3 jPos = iPos + pSun * (jTime + jStepSize * 0.5); - - // Calculate the height of the sample. - float jHeight = length(jPos) - rPlanet; - - // Accumulate the optical depth. - jOdRlh += exp(-jHeight / shRlh) * jStepSize; - jOdMie += exp(-jHeight / shMie) * jStepSize; - - // Increment the secondary ray time. - jTime += jStepSize; - } - - // Calculate attenuation. - float3 attn = exp(-(kMie * (iOdMie + jOdMie) + kRlh * (iOdRlh + jOdRlh))); - - // Accumulate scattering. - totalRlh += odStepRlh * attn; - totalMie += odStepMie * attn; - - // Increment the primary ray time. - iTime += iStepSize; - - } - - // Calculate and return the final color. - return iSun * (pRlh * kRlh * totalRlh + pMie * kMie * totalMie); - } - - half _Exposure; - - fixed4 frag (v2f i) : SV_Target - { - half3 color = atmosphere( - normalize(i.rayDir), // normalized ray direction - float3(0,6372e3,0), // ray origin - _WorldSpaceLightPos0.xyz, // position of the sun - 22.0, // intensity of the sun - 6371e3, // radius of the planet in meters - 6471e3, // radius of the atmosphere in meters - float3(5.5e-6, 13.0e-6, 22.4e-6), // Rayleigh scattering coefficient - 21e-6, // Mie scattering coefficient - 8e3, // Rayleigh scale height - 1.2e3, // Mie scale height - 0.758 // Mie preferred scattering direction - ); - - #if !defined(UNITY_COLORSPACE_GAMMA) - color.rgb = GammaToLinearSpace(color.rgb); - #endif - - color = 1.0 - exp(-1.0 * color * _Exposure); - - return half4(color, 1.0); - } - ENDCG - } - } -} diff --git a/Unity-19050-05-BallPool/Assets/Shader/AtmosphereSkybox.shader.meta b/Unity-19050-05-BallPool/Assets/Shader/AtmosphereSkybox.shader.meta deleted file mode 100644 index 6263161..0000000 --- a/Unity-19050-05-BallPool/Assets/Shader/AtmosphereSkybox.shader.meta +++ /dev/null @@ -1,10 +0,0 @@ -fileFormatVersion: 2 -guid: b5783fccd952891499da0155fe5c3887 -timeCreated: 1513325172 -licenseType: Free -ShaderImporter: - externalObjects: {} - defaultTextures: [] - userData: - assetBundleName: - assetBundleVariant: diff --git a/Unity-19050-05-BallPool/Assets/UnityUtilityNativePlugin/Script/Singleton.cs b/Unity-19050-05-BallPool/Assets/UnityUtilityNativePlugin/Script/Singleton.cs deleted file mode 100644 index 3140efc..0000000 --- a/Unity-19050-05-BallPool/Assets/UnityUtilityNativePlugin/Script/Singleton.cs +++ /dev/null @@ -1,67 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -namespace UltraCombos -{ - public abstract class Singleton : MonoBehaviour where T : Component - { - - #region Fields - - /// - /// The instance. - /// - private static T instance; - - #endregion - - #region Properties - - /// - /// Gets the instance. - /// - /// The instance. - public static T Instance - { - get - { - if (instance == null) - { - instance = FindObjectOfType(); - if (instance == null) - { - GameObject obj = new GameObject(); - obj.name = typeof(T).Name; - instance = obj.AddComponent(); - } - } - return instance; - } - } - - #endregion - - #region Methods - - /// - /// Use this for initialization. - /// - protected virtual void Awake() - { - if (instance == null) - { - instance = this as T; - DontDestroyOnLoad(gameObject); - } - else - { - Destroy(gameObject); - } - } - - #endregion - - } -} - diff --git a/Unity-19050-05-BallPool/Assets/UnityUtilityNativePlugin/Script/Singleton.cs.meta b/Unity-19050-05-BallPool/Assets/UnityUtilityNativePlugin/Script/Singleton.cs.meta deleted file mode 100644 index 38b6470..0000000 --- a/Unity-19050-05-BallPool/Assets/UnityUtilityNativePlugin/Script/Singleton.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: f2ea6802f1a44644b8529a25d10c7b69 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Unity-19050-05-BallPool/Assets/UnityUtils/Activity.meta b/Unity-19050-05-BallPool/Assets/UnityUtils/Activity.meta deleted file mode 100644 index 14cf06f..0000000 --- a/Unity-19050-05-BallPool/Assets/UnityUtils/Activity.meta +++ /dev/null @@ -1,9 +0,0 @@ -fileFormatVersion: 2 -guid: cbc5c875c34d5274ba5053c90d8a7d31 -folderAsset: yes -timeCreated: 1479726129 -licenseType: Free -DefaultImporter: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Unity-19050-05-BallPool/Assets/UnityUtils/Activity/Activities.meta b/Unity-19050-05-BallPool/Assets/UnityUtils/Activity/Activities.meta deleted file mode 100644 index de07a4b..0000000 --- a/Unity-19050-05-BallPool/Assets/UnityUtils/Activity/Activities.meta +++ /dev/null @@ -1,9 +0,0 @@ -fileFormatVersion: 2 -guid: ee654c62631815f42acac2284e0fd6c5 -folderAsset: yes -timeCreated: 1481189701 -licenseType: Free -DefaultImporter: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Unity-19050-05-BallPool/Assets/UnityUtils/Activity/Activities/TemplateActivity.cs b/Unity-19050-05-BallPool/Assets/UnityUtils/Activity/Activities/TemplateActivity.cs deleted file mode 100644 index fcbc7b4..0000000 --- a/Unity-19050-05-BallPool/Assets/UnityUtils/Activity/Activities/TemplateActivity.cs +++ /dev/null @@ -1,35 +0,0 @@ -using UnityEngine; -using System.Collections; -using uc; - -public class TemplateActivity : Activity -{ - private void Start() - { - - } - - protected override void OnEnter() - { - - } - - protected override void OnUpdate() - { - base.OnUpdate(); - - if (IsEntering == false) - return; - } - - protected override void OnLeave() - { - base.OnLeave(); - } - - protected override void OnKilled() - { - base.OnKilled(); - } - -} diff --git a/Unity-19050-05-BallPool/Assets/UnityUtils/Activity/Activities/TemplateActivity.cs.meta b/Unity-19050-05-BallPool/Assets/UnityUtils/Activity/Activities/TemplateActivity.cs.meta deleted file mode 100644 index 7c5d24e..0000000 --- a/Unity-19050-05-BallPool/Assets/UnityUtils/Activity/Activities/TemplateActivity.cs.meta +++ /dev/null @@ -1,12 +0,0 @@ -fileFormatVersion: 2 -guid: 95112bb8325859542bfb3e7a522aec89 -timeCreated: 1479726276 -licenseType: Free -MonoImporter: - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Unity-19050-05-BallPool/Assets/UnityUtils/Activity/Activities/TimerActivity.cs b/Unity-19050-05-BallPool/Assets/UnityUtils/Activity/Activities/TimerActivity.cs deleted file mode 100644 index c39531c..0000000 --- a/Unity-19050-05-BallPool/Assets/UnityUtils/Activity/Activities/TimerActivity.cs +++ /dev/null @@ -1,60 +0,0 @@ -using UnityEngine; -using UnityEngine.Events; - -namespace uc -{ - public class TimerActivity : Activity - { - [AutoUI] - public float timerDuration = 5.0f; - - public float setstamp { set { timer_stamp = value; } } - - public float timer_stamp = 0.0f; - - public UnityEvent onTimesUp = new UnityEvent(); - - public float remainingTime { get { return Mathf.Clamp(timerDuration - (Time.time - timer_stamp), 0, timerDuration); } } - - private void Start() - { - - } - - protected override void OnEnter() - { - base.OnEnter(); - - timer_stamp = Time.time; - } - - protected override void OnUpdate() - { - base.OnUpdate(); - - if (IsEntering == false) - return; - - if (IsFinished) - return; - - if (Time.time - timer_stamp > timerDuration) - { - onTimesUp.Invoke(); - IsFinished = true; - } - } - - protected override void OnLeave() - { - base.OnLeave(); - } - - protected override void OnKilled() - { - base.OnKilled(); - } - } -} - - diff --git a/Unity-19050-05-BallPool/Assets/UnityUtils/Activity/Activities/TimerActivity.cs.meta b/Unity-19050-05-BallPool/Assets/UnityUtils/Activity/Activities/TimerActivity.cs.meta deleted file mode 100644 index 0fe3da1..0000000 --- a/Unity-19050-05-BallPool/Assets/UnityUtils/Activity/Activities/TimerActivity.cs.meta +++ /dev/null @@ -1,12 +0,0 @@ -fileFormatVersion: 2 -guid: de6bd8682b4213f44958b0f47a294a3a -timeCreated: 1479726276 -licenseType: Free -MonoImporter: - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Unity-19050-05-BallPool/Assets/UnityUtils/Activity/Activity.cs b/Unity-19050-05-BallPool/Assets/UnityUtils/Activity/Activity.cs deleted file mode 100644 index 2bb9698..0000000 --- a/Unity-19050-05-BallPool/Assets/UnityUtils/Activity/Activity.cs +++ /dev/null @@ -1,53 +0,0 @@ -using UnityEngine; -using System.Collections.Generic; -using uc; - -namespace uc -{ - public class Activity : ActivityBase - { - public Activity source; - - [SerializeField] - float idleTime = 0.0f; - - public List canvases = new List(); - public bool isIdle - { - get - { - if (idleTime == 0.0f) - return false; - float stamp = 0.0f; - foreach (var canvas in canvases) - stamp = Mathf.Max(stamp, canvas.ActiveStamp); - float dt = Time.time - stamp; - return (dt > idleTime); - } - } - - protected override void OnEnter() - { - foreach (var canvas in canvases) - canvas.Enter(); - } - - protected override void OnUpdate() - { - - } - - protected override void OnLeave() - { - foreach (var canvas in canvases) - canvas.Leave(); - } - - protected override void OnKilled() - { - if (gameObject != null) - Destroy(gameObject); - } - } -} - diff --git a/Unity-19050-05-BallPool/Assets/UnityUtils/Activity/Activity.cs.meta b/Unity-19050-05-BallPool/Assets/UnityUtils/Activity/Activity.cs.meta deleted file mode 100644 index cd1a4ab..0000000 --- a/Unity-19050-05-BallPool/Assets/UnityUtils/Activity/Activity.cs.meta +++ /dev/null @@ -1,12 +0,0 @@ -fileFormatVersion: 2 -guid: 6ec255d83c4dd8340913dd710c8c07a4 -timeCreated: 1479726276 -licenseType: Free -MonoImporter: - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Unity-19050-05-BallPool/Assets/UnityUtils/Activity/ActivityBase.cs b/Unity-19050-05-BallPool/Assets/UnityUtils/Activity/ActivityBase.cs deleted file mode 100644 index 6fa372c..0000000 --- a/Unity-19050-05-BallPool/Assets/UnityUtils/Activity/ActivityBase.cs +++ /dev/null @@ -1,124 +0,0 @@ -using System; -using System.Collections.Generic; -using UnityEngine; -using UnityEngine.Events; - -namespace uc -{ - public enum ActivityEventType - { - Enter, - Finish, - Leave, - Killed - } - - public class ActivityBase : MonoBehaviour - { - bool is_finished = false; - public bool IsFinished { set { is_finished = value; } get { return is_finished; } } - - float activity_duration = 0.0f; - public float Duration { get { return activity_duration; } } - - bool is_entering = false; - public bool IsEntering { get { return is_entering; } } - - float stamp = 0.0f; - - [Serializable] - public class Entry - { - public ActivityEventType eventID = ActivityEventType.Enter; - public UnityEvent callback = new UnityEvent(); - } - - [SerializeField] - private List m_Delegates; - - public List triggers - { - get - { - if (m_Delegates == null) - m_Delegates = new List(); - return m_Delegates; - } - set { m_Delegates = value; } - } - - protected virtual void OnEnter() { } - public void Enter() - { - gameObject.SetActive(true); - is_entering = true; - is_finished = false; - stamp = Time.time; - activity_duration = 0.0f; - OnEnter(); - OnEnterEvent(); - } - - protected virtual void OnUpdate() { } - private void Update() - { - activity_duration = Time.time - stamp; - OnUpdate(); - } - - protected virtual void OnLeave() { } - public void Leave() - { - is_entering = false; - is_finished = true; - stamp = Time.time; - OnLeave(); - OnLeaveEvent(); - } - - protected virtual void OnFinish() { } - public void Finish() - { - OnFinish(); - OnFinishEvent(); - } - - protected virtual void OnKilled() { } - public void Killed() - { - Leave(); - OnKilled(); - OnKillEvent(); - } - - private void Execute(ActivityEventType id) - { - for (int i = 0, imax = triggers.Count; i < imax; ++i) - { - var ent = triggers[i]; - if (ent.eventID == id && ent.callback != null) - ent.callback.Invoke(); - } - } - - private void OnEnterEvent() - { - Execute(ActivityEventType.Enter); - } - - private void OnFinishEvent() - { - Execute(ActivityEventType.Finish); - } - - private void OnLeaveEvent() - { - Execute(ActivityEventType.Leave); - } - - private void OnKillEvent() - { - Execute(ActivityEventType.Killed); - } - } -} \ No newline at end of file diff --git a/Unity-19050-05-BallPool/Assets/UnityUtils/Activity/ActivityBase.cs.meta b/Unity-19050-05-BallPool/Assets/UnityUtils/Activity/ActivityBase.cs.meta deleted file mode 100644 index 4c47bac..0000000 --- a/Unity-19050-05-BallPool/Assets/UnityUtils/Activity/ActivityBase.cs.meta +++ /dev/null @@ -1,12 +0,0 @@ -fileFormatVersion: 2 -guid: 2af6d95f21a93714e944186ff0e29f68 -timeCreated: 1481096454 -licenseType: Free -MonoImporter: - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Unity-19050-05-BallPool/Assets/UnityUtils/Activity/ActivityManager.cs b/Unity-19050-05-BallPool/Assets/UnityUtils/Activity/ActivityManager.cs deleted file mode 100644 index 7f2be1c..0000000 --- a/Unity-19050-05-BallPool/Assets/UnityUtils/Activity/ActivityManager.cs +++ /dev/null @@ -1,98 +0,0 @@ -using UnityEngine; -using UnityEngine.UI; -using System; -using System.Collections; -using System.Collections.Generic; -using UltraCombos; - -namespace uc -{ - public class ActivityManager : MonoBehaviour - { - [Header("General")] - public Activity initialActivity; - Stack activity_history = new Stack(); - public virtual Activity current_activity { get { return (activity_history.Count > 0) ? activity_history.Peek() : null; } } - public bool isIdleMode = false; - - protected const string module = "Activity Manager"; - - void Start() - { - PushActivity(initialActivity); - Misc.Verbose(module, string.Format("init with activity: {0}", current_activity.name)); - } - - void Update() - { - CheckIdle(); - } - - protected void CheckIdle() - { - if (current_activity != null && isIdleMode) - { - if (current_activity.isIdle) - PopToInitial(); - } - } - - - #region PUSH - public virtual void PushActivity(Activity newActivity) - { - if (newActivity == null) - return; - - if (current_activity != null) - { - current_activity.Leave(); - } - activity_history.Push(Clone(newActivity)); - current_activity.Enter(); - } - #endregion - - #region POP - public virtual void PopToActivity(Activity targetActivity) - { - if (targetActivity != null) - { - while (current_activity.source != targetActivity && activity_history.Count > 1) - { - current_activity.Killed(); - activity_history.Pop(); - } - } - else - { - if (activity_history.Count > 1) - { - current_activity.Killed(); - activity_history.Pop(); - } - } - current_activity.Enter(); - } - - public virtual void PopActivity() - { - PopToActivity(null); - } - - public virtual void PopToInitial() - { - PopToActivity(initialActivity); - } - #endregion - - Activity Clone(Activity newActivity) - { - var obj = Instantiate(newActivity.gameObject); - obj.transform.SetParent(transform, false); - Activity act = obj.GetComponent(); - act.source = newActivity; - return act; - } - } -} \ No newline at end of file diff --git a/Unity-19050-05-BallPool/Assets/UnityUtils/Activity/ActivityManager.cs.meta b/Unity-19050-05-BallPool/Assets/UnityUtils/Activity/ActivityManager.cs.meta deleted file mode 100644 index f4ec6cb..0000000 --- a/Unity-19050-05-BallPool/Assets/UnityUtils/Activity/ActivityManager.cs.meta +++ /dev/null @@ -1,12 +0,0 @@ -fileFormatVersion: 2 -guid: 149c2da9ee7879344a5f42865c6e2d71 -timeCreated: 1479726276 -licenseType: Free -MonoImporter: - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Unity-19050-05-BallPool/Assets/UnityUtils/Activity/ActivityQueueManager.cs b/Unity-19050-05-BallPool/Assets/UnityUtils/Activity/ActivityQueueManager.cs deleted file mode 100644 index 2feeba1..0000000 --- a/Unity-19050-05-BallPool/Assets/UnityUtils/Activity/ActivityQueueManager.cs +++ /dev/null @@ -1,160 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UltraCombos; -using UnityEngine; -using UnityEngine.EventSystems; - -namespace uc -{ - public class ActivityQueueManager : ActivityManager - { - [Header("Queue Manager")] - public bool initializeOnStart = false; - public bool isPresentMode; - public bool circularMode = false; - public Transform activityQueue; - List activity_list = null; - int current_index = -1; - public int CurrentIndex { get { return current_index; } } - public override Activity current_activity - { - get - { - if (activity_list != null) - { - if (activity_list.Count > 0) - { - if (current_index >= 0 && current_index < activity_list.Count) - return activity_list[current_index]; - } - } - return null; - } - } - - public void Initialize() - { - activity_list = new List(); - if (activityQueue != null) - { - var acts = activityQueue.GetComponentsInChildren(); - activity_list.AddRange(acts); - initialActivity = activity_list[0]; - GenerateActivityQueueFile(); - } - - var canvases = Resources.FindObjectsOfTypeAll(typeof(CanvasActivity)) as CanvasActivity[]; - var canvas_activities = new List(); - canvas_activities.AddRange(canvases); - foreach (var act in activity_list) - { - if (act.canvases.Count > 0) - continue; - act.canvases = canvas_activities.FindAll( - delegate (CanvasActivity ca) { - return (ca.gameObject.name == act.gameObject.name); - }); - } - - Misc.Verbose(module, string.Format("has {0} activities", activity_list.Count)); - } - - private void Start() - { - if (initializeOnStart) - Initialize(); - - SetActivityByIndex(0); - Misc.Verbose(module, string.Format("init with activity: {0}", current_activity.name)); - } - - private void Update() - { - - CheckIdle(); - - if (isPresentMode) - { - if (Input.GetKeyDown(KeyCode.PageDown)) - { - NextActivity(); - } - else if (Input.GetKeyDown(KeyCode.PageUp)) - { - PreviousActivity(); - } - else if (Input.GetKeyDown(KeyCode.O)) - { - PopToInitial(); - } - } - - gameObject.name = "Activity Manager: " + current_activity.name; - } - - public void NextActivity() - { - if (current_index + 1 >= activity_list.Count && circularMode) - { - SetActivityByIndex(0); - } - else - { - SetActivityByIndex(current_index + 1); - } - } - - public void PreviousActivity() - { - if (current_index - 1 <0 && circularMode) - { - SetActivityByIndex(activity_list.Count -1); - } - else - SetActivityByIndex(current_index - 1); - } - - public void SetActivityByIndex(int index) - { - if (activity_list == null || index < 0 || index >= activity_list.Count) - { - //Debug.LogWarningFormat("Cannot set page {0} in ActivityManager", index); - return; - } - - if (current_index == index) - return; - - - if (current_activity != null) - { - current_activity.Leave(); - } - current_index = index; - current_activity.Enter(); - } - - public override void PopToInitial() - { - SetActivityByIndex(0); - } - - public override void PushActivity(Activity newActivity) { } - public override void PopToActivity(Activity targetActivity) { } - public override void PopActivity() { } - - - class ActivityListObject { public List list = new List(); } - - void GenerateActivityQueueFile() - { - var obj = new ActivityListObject(); - for (int i = 0; i < activity_list.Count; i++) - obj.list.Add(string.Format("{0:D2} - {1}", i, activity_list[i].name)); - string json = JsonUtility.ToJson(obj, true); - var root = System.IO.Directory.GetParent(Application.dataPath); - string path = System.IO.Path.Combine(root.FullName, gameObject.name + " Queue.json"); - System.IO.File.WriteAllText(path, json); - } - } -} diff --git a/Unity-19050-05-BallPool/Assets/UnityUtils/Activity/ActivityQueueManager.cs.meta b/Unity-19050-05-BallPool/Assets/UnityUtils/Activity/ActivityQueueManager.cs.meta deleted file mode 100644 index 5a2c655..0000000 --- a/Unity-19050-05-BallPool/Assets/UnityUtils/Activity/ActivityQueueManager.cs.meta +++ /dev/null @@ -1,12 +0,0 @@ -fileFormatVersion: 2 -guid: 707b124915eb1634d9391e9dbdcad225 -timeCreated: 1490674521 -licenseType: Free -MonoImporter: - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Unity-19050-05-BallPool/Assets/UnityUtils/Activity/CanvasActivity.cs b/Unity-19050-05-BallPool/Assets/UnityUtils/Activity/CanvasActivity.cs deleted file mode 100644 index aa56c82..0000000 --- a/Unity-19050-05-BallPool/Assets/UnityUtils/Activity/CanvasActivity.cs +++ /dev/null @@ -1,143 +0,0 @@ -using System.Collections.Generic; -using UnityEngine; -using UnityEngine.UI; - -namespace uc -{ - [RequireComponent(typeof(CanvasGroup))] - public class CanvasActivity : ActivityBase - { - [SerializeField] - protected float fadeTime = 0.5f; - [SerializeField] - protected float fadeOutTime = 0.5f; - - [SerializeField] - float touchDelayTime = 0.0f; - - public List sharedComponents = new List(); - - CanvasGroup canvas_group; - List canvas_activities = new List(); - bool CanvasGroupProperty { set { canvas_group.interactable = canvas_group.blocksRaycasts = value; } } - float CanvasGroupAlpha { set { canvas_group.alpha = value; } get { return canvas_group.alpha; } } - - float active_stamp; - public float ActiveStamp { get { return active_stamp; } } - - - private void Awake() - { - var acts = transform.GetComponentsInChildren(true); - canvas_activities.AddRange(acts); - canvas_activities.Remove(this); - // search all ui component to refresh stamp - foreach (var button in GetComponentsInChildren