denikson 6 years ago
parent
commit
7dd2ac6140

+ 5 - 5
Assembly-CSharp.sln

@@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
 # Visual Studio 15
 VisualStudioVersion = 15.0.26228.4
 VisualStudioVersion = 15.0.26228.4
 MinimumVisualStudioVersion = 10.0.40219.1
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Assembly-CSharp", "Assembly-CSharp\Assembly-CSharp.csproj", "{76F74361-87FC-4BC2-9EC7-6D84812CCBA5}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Assembly-CSharp", "Assembly-CSharp\Assembly-CSharp.csproj", "{8DCC3E84-9584-4D72-87B5-7E89D4EBDF34}"
 EndProject
 EndProject
 Global
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -11,10 +11,10 @@ Global
 		Release|Any CPU = Release|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{76F74361-87FC-4BC2-9EC7-6D84812CCBA5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{76F74361-87FC-4BC2-9EC7-6D84812CCBA5}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{76F74361-87FC-4BC2-9EC7-6D84812CCBA5}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{76F74361-87FC-4BC2-9EC7-6D84812CCBA5}.Release|Any CPU.Build.0 = Release|Any CPU
+		{8DCC3E84-9584-4D72-87B5-7E89D4EBDF34}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8DCC3E84-9584-4D72-87B5-7E89D4EBDF34}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8DCC3E84-9584-4D72-87B5-7E89D4EBDF34}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{8DCC3E84-9584-4D72-87B5-7E89D4EBDF34}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 		HideSolutionNode = FALSE

+ 1 - 1
Assembly-CSharp/Assembly-CSharp.csproj

@@ -4,7 +4,7 @@
   <PropertyGroup>
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{76F74361-87FC-4BC2-9EC7-6D84812CCBA5}</ProjectGuid>
+    <ProjectGuid>{8DCC3E84-9584-4D72-87B5-7E89D4EBDF34}</ProjectGuid>
     <OutputType>Library</OutputType>
     <OutputType>Library</OutputType>
     <RootNamespace>Assembly-CSharp</RootNamespace>
     <RootNamespace>Assembly-CSharp</RootNamespace>
     <AssemblyName>Assembly-CSharp</AssemblyName>
     <AssemblyName>Assembly-CSharp</AssemblyName>

+ 4 - 1
Assembly-CSharp/YotogiParamScroll.cs

@@ -127,7 +127,10 @@ public class YotogiParamScroll : MonoBehaviour
 	private static void SetLabelText(YotogiParamScroll.LabelAndLocalize labelAndLocalize, string text, int num)
 	private static void SetLabelText(YotogiParamScroll.LabelAndLocalize labelAndLocalize, string text, int num)
 	{
 	{
 		labelAndLocalize.label.text = text;
 		labelAndLocalize.label.text = text;
-		labelAndLocalize.localize.SetTerm("MaidStatus/" + text);
+		if (labelAndLocalize.localize != null)
+		{
+			labelAndLocalize.localize.SetTerm("MaidStatus/" + text);
+		}
 		UILabel label = labelAndLocalize.label;
 		UILabel label = labelAndLocalize.label;
 		label.text = label.text + "  " + num.ToString();
 		label.text = label.text + "  " + num.ToString();
 	}
 	}