Browse Source

Shut down mimagame2

jet 8 years ago
parent
commit
ad0f0458ca

BIN
.vs/MyLovelyGarden/v14/.suo


+ 2 - 2
Assets/Extension.meta → Assets/Advertisements/Editor/Resources/Android/builds.meta

@@ -1,7 +1,7 @@
 fileFormatVersion: 2
-guid: b948198483a8b93419206e81215060f3
+guid: 8d2d384f78b29a44a9c70c3daf45d1cb
 folderAsset: yes
-timeCreated: 1496150477
+timeCreated: 1494301205
 licenseType: Pro
 DefaultImporter:
   userData: 

+ 8 - 0
Assets/Advertisements/Editor/Resources/Android/builds.zip.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 9cb5c3e4dd0dd574ba655453ad15edfa
+timeCreated: 1494301205
+licenseType: Pro
+DefaultImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 9 - 0
Assets/Advertisements/Editor/Resources/iOS.meta

@@ -0,0 +1,9 @@
+fileFormatVersion: 2
+guid: a5e10dc911691a844b899edb78584282
+folderAsset: yes
+timeCreated: 1494301205
+licenseType: Pro
+DefaultImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 9 - 0
Assets/Advertisements/Editor/Resources/iOS/builds.meta

@@ -0,0 +1,9 @@
+fileFormatVersion: 2
+guid: f533cc2da3e36884f93fdd5dc9124f8c
+folderAsset: yes
+timeCreated: 1494301205
+licenseType: Pro
+DefaultImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 1 - 0
Assets/Advertisements/Editor/Resources/iOS/builds.zip.last_extracted_md5

@@ -0,0 +1 @@
+6f667895f9cb6ec276ab1bddf998feb4

+ 8 - 0
Assets/Advertisements/Editor/Resources/iOS/builds.zip.last_extracted_md5.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 610c0877dfcd5464e88d4ce46c46c556
+timeCreated: 1494301205
+licenseType: Pro
+DefaultImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 8 - 0
Assets/Advertisements/Editor/Resources/iOS/builds.zip.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: deca0ba656ca01b40a6bc5a68c0561b1
+timeCreated: 1494301205
+licenseType: Pro
+DefaultImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

BIN
Assets/Resource/Logo.unity


+ 16 - 15
Assets/Script/Manage/ManaMiniGame.cs

@@ -1021,21 +1021,22 @@ public class ManaMiniGame : Regist
         D_Operate1.SetActive(false);
         D_Operate2.SetActive(false);
 
-        if (ManaCenter.Level >= 18)
-        {
-            if (Random.Range(0f, 1f) <= 0.5f)
-            {
-                GameB = true;
-            }
-            else
-            {
-                GameA = true;
-            }
-        }
-        else
-        {
-            GameA = true;
-        }
+        GameA = true;
+        //if (ManaCenter.Level >= 18)
+        //{
+        //    if (Random.Range(0f, 1f) <= 0.5f)
+        //    {
+        //        GameB = true;
+        //    }
+        //    else
+        //    {
+        //        GameA = true;
+        //    }
+        //}
+        //else
+        //{
+        //    GameA = true;
+        //}
     }
 
 

+ 25 - 22
MyLovelyGarden.sln

@@ -1,13 +1,13 @@
 
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 2015
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MyLovelyGarden.Plugins", "MyLovelyGarden.Plugins.csproj", "{6E74E584-9DFC-C050-676F-69A7C37E7E0C}"
+Microsoft Visual Studio Solution File, Format Version 11.00
+# Visual Studio 2010
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MyLovelyGarden", "Assembly-CSharp-firstpass.csproj", "{76439BDA-6081-7FA3-9C3B-368968A7EA5E}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MyLovelyGarden", "MyLovelyGarden.csproj", "{9F3A3259-D53B-F6C8-8878-C5B99621035A}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MyLovelyGarden", "Assembly-CSharp.csproj", "{21BB93BC-2239-D8F5-1219-201F8DCBAF49}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MyLovelyGarden.Editor.Plugins", "MyLovelyGarden.Editor.Plugins.csproj", "{30FF29F4-DBAE-475C-A2D4-DCA87549A28A}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MyLovelyGarden", "Assembly-CSharp-Editor-firstpass.csproj", "{527B5E1B-6A56-0EB9-22D1-0FE7785A959A}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MyLovelyGarden.Editor", "MyLovelyGarden.Editor.csproj", "{B575449E-FD9A-1672-368B-EC1E1252F6E4}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MyLovelyGarden", "Assembly-CSharp-Editor.csproj", "{A08052E5-32CE-91C0-FF56-C60C901D6BEF}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -15,24 +15,27 @@ Global
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{6E74E584-9DFC-C050-676F-69A7C37E7E0C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{6E74E584-9DFC-C050-676F-69A7C37E7E0C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{6E74E584-9DFC-C050-676F-69A7C37E7E0C}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{6E74E584-9DFC-C050-676F-69A7C37E7E0C}.Release|Any CPU.Build.0 = Release|Any CPU
-		{9F3A3259-D53B-F6C8-8878-C5B99621035A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{9F3A3259-D53B-F6C8-8878-C5B99621035A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{9F3A3259-D53B-F6C8-8878-C5B99621035A}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{9F3A3259-D53B-F6C8-8878-C5B99621035A}.Release|Any CPU.Build.0 = Release|Any CPU
-		{30FF29F4-DBAE-475C-A2D4-DCA87549A28A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{30FF29F4-DBAE-475C-A2D4-DCA87549A28A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{30FF29F4-DBAE-475C-A2D4-DCA87549A28A}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{30FF29F4-DBAE-475C-A2D4-DCA87549A28A}.Release|Any CPU.Build.0 = Release|Any CPU
-		{B575449E-FD9A-1672-368B-EC1E1252F6E4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B575449E-FD9A-1672-368B-EC1E1252F6E4}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B575449E-FD9A-1672-368B-EC1E1252F6E4}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{B575449E-FD9A-1672-368B-EC1E1252F6E4}.Release|Any CPU.Build.0 = Release|Any CPU
+		{76439BDA-6081-7FA3-9C3B-368968A7EA5E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{76439BDA-6081-7FA3-9C3B-368968A7EA5E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{76439BDA-6081-7FA3-9C3B-368968A7EA5E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{76439BDA-6081-7FA3-9C3B-368968A7EA5E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{21BB93BC-2239-D8F5-1219-201F8DCBAF49}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{21BB93BC-2239-D8F5-1219-201F8DCBAF49}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{21BB93BC-2239-D8F5-1219-201F8DCBAF49}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{21BB93BC-2239-D8F5-1219-201F8DCBAF49}.Release|Any CPU.Build.0 = Release|Any CPU
+		{527B5E1B-6A56-0EB9-22D1-0FE7785A959A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{527B5E1B-6A56-0EB9-22D1-0FE7785A959A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{527B5E1B-6A56-0EB9-22D1-0FE7785A959A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{527B5E1B-6A56-0EB9-22D1-0FE7785A959A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A08052E5-32CE-91C0-FF56-C60C901D6BEF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A08052E5-32CE-91C0-FF56-C60C901D6BEF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A08052E5-32CE-91C0-FF56-C60C901D6BEF}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A08052E5-32CE-91C0-FF56-C60C901D6BEF}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
+	GlobalSection(MonoDevelopProperties) = preSolution
+		StartupItem = Assembly-CSharp.csproj
+	EndGlobalSection
 EndGlobal

BIN
ProjectSettings/GraphicsSettings.asset


+ 1 - 1
ProjectSettings/ProjectVersion.txt

@@ -1 +1 @@
-m_EditorVersion: 5.5.0f3
+m_EditorVersion: 5.5.2f1