ghorsington 5 years ago
parent
commit
40af432206

+ 5 - 5
Assembly-CSharp.sln

@@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
 VisualStudioVersion = 15.0.26228.4
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Assembly-CSharp", "Assembly-CSharp\Assembly-CSharp.csproj", "{8CE48584-AE4B-44DE-B9DF-2F39AA7910F0}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Assembly-CSharp", "Assembly-CSharp\Assembly-CSharp.csproj", "{811713BE-54A8-4AB0-8663-1F98FC692F92}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -11,10 +11,10 @@ Global
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{8CE48584-AE4B-44DE-B9DF-2F39AA7910F0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{8CE48584-AE4B-44DE-B9DF-2F39AA7910F0}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{8CE48584-AE4B-44DE-B9DF-2F39AA7910F0}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{8CE48584-AE4B-44DE-B9DF-2F39AA7910F0}.Release|Any CPU.Build.0 = Release|Any CPU
+		{811713BE-54A8-4AB0-8663-1F98FC692F92}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{811713BE-54A8-4AB0-8663-1F98FC692F92}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{811713BE-54A8-4AB0-8663-1F98FC692F92}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{811713BE-54A8-4AB0-8663-1F98FC692F92}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

+ 16 - 16
Assembly-CSharp/Assembly-CSharp.csproj

@@ -4,7 +4,7 @@
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{8CE48584-AE4B-44DE-B9DF-2F39AA7910F0}</ProjectGuid>
+    <ProjectGuid>{811713BE-54A8-4AB0-8663-1F98FC692F92}</ProjectGuid>
     <OutputType>Library</OutputType>
     <RootNamespace>Assembly-CSharp</RootNamespace>
     <AssemblyName>Assembly-CSharp</AssemblyName>
@@ -34,49 +34,49 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Assembly-CSharp-firstpass">
-      <HintPath>..\..\COM\up125\Managed\Assembly-CSharp-firstpass.dll</HintPath>
+      <HintPath>..\..\com_managed\Managed\Assembly-CSharp-firstpass.dll</HintPath>
     </Reference>
     <Reference Include="Assembly-UnityScript-firstpass">
-      <HintPath>..\..\COM\up125\Managed\Assembly-UnityScript-firstpass.dll</HintPath>
+      <HintPath>..\..\com_managed\Managed\Assembly-UnityScript-firstpass.dll</HintPath>
     </Reference>
     <Reference Include="FoveUnityPlugin">
-      <HintPath>..\..\COM\up125\Managed\FoveUnityPlugin.dll</HintPath>
+      <HintPath>..\..\com_managed\Managed\FoveUnityPlugin.dll</HintPath>
     </Reference>
     <Reference Include="Ionic.Zlib">
-      <HintPath>..\..\COM\up125\Managed\Ionic.Zlib.dll</HintPath>
+      <HintPath>..\..\com_managed\Managed\Ionic.Zlib.dll</HintPath>
     </Reference>
     <Reference Include="JsonFx.Json">
-      <HintPath>..\..\COM\up125\Managed\JsonFx.Json.dll</HintPath>
+      <HintPath>..\..\com_managed\Managed\JsonFx.Json.dll</HintPath>
     </Reference>
     <Reference Include="LeapCSharp.NET3.5">
-      <HintPath>..\..\COM\up125\Managed\LeapCSharp.NET3.5.dll</HintPath>
+      <HintPath>..\..\com_managed\Managed\LeapCSharp.NET3.5.dll</HintPath>
     </Reference>
     <Reference Include="System">
-      <HintPath>..\..\COM\up125\Managed\System.dll</HintPath>
+      <HintPath>..\..\com_managed\Managed\System.dll</HintPath>
     </Reference>
     <Reference Include="System.Core">
-      <HintPath>..\..\COM\up125\Managed\System.Core.dll</HintPath>
+      <HintPath>..\..\com_managed\Managed\System.Core.dll</HintPath>
     </Reference>
     <Reference Include="System.Drawing">
-      <HintPath>..\..\COM\up125\Managed\System.Drawing.dll</HintPath>
+      <HintPath>..\..\com_managed\Managed\System.Drawing.dll</HintPath>
     </Reference>
     <Reference Include="System.Windows.Forms">
-      <HintPath>..\..\COM\up125\Managed\System.Windows.Forms.dll</HintPath>
+      <HintPath>..\..\com_managed\Managed\System.Windows.Forms.dll</HintPath>
     </Reference>
     <Reference Include="System.Xml">
-      <HintPath>..\..\COM\up125\Managed\System.Xml.dll</HintPath>
+      <HintPath>..\..\com_managed\Managed\System.Xml.dll</HintPath>
     </Reference>
     <Reference Include="System.Xml.Linq">
-      <HintPath>..\..\COM\up125\Managed\System.Xml.Linq.dll</HintPath>
+      <HintPath>..\..\com_managed\Managed\System.Xml.Linq.dll</HintPath>
     </Reference>
     <Reference Include="UnityEngine">
-      <HintPath>..\..\COM\up125\Managed\UnityEngine.dll</HintPath>
+      <HintPath>..\..\com_managed\Managed\UnityEngine.dll</HintPath>
     </Reference>
     <Reference Include="UnityEngine.UI">
-      <HintPath>..\..\COM\up125\Managed\UnityEngine.UI.dll</HintPath>
+      <HintPath>..\..\com_managed\Managed\UnityEngine.UI.dll</HintPath>
     </Reference>
     <Reference Include="zxing.unity">
-      <HintPath>..\..\COM\up125\Managed\zxing.unity.dll</HintPath>
+      <HintPath>..\..\com_managed\Managed\zxing.unity.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>

+ 1 - 1
Assembly-CSharp/EditItemTextureCache.cs

@@ -49,7 +49,7 @@ public class EditItemTextureCache : MonoBehaviour
 		Texture2D texture2D = null;
 		if (!this.loadTex.TryGetValue(rid, out texture2D))
 		{
-			texture2D = ImportCM.CreateTexture(this.ridToFileNameDic[rid]);
+			texture2D = ImportCM.CreateTexture((!this.IsRegister(rid)) ? "notex.tex" : this.ridToFileNameDic[rid]);
 			this.loadTex.Add(rid, texture2D);
 		}
 		return texture2D;

+ 5 - 0
Assembly-CSharp/MessageClass.cs

@@ -111,6 +111,11 @@ public class MessageClass
 		return text2;
 	}
 
+	public void SetText(string name, string text, string voice_file, int voice_pitch)
+	{
+		this.SetText(name, text, voice_file, voice_pitch, AudioSourceMgr.Type.VoiceHeroine);
+	}
+
 	public void SetText(string name, string text, string voice_file, int voice_pitch, AudioSourceMgr.Type type)
 	{
 		this.exit_wait_count_ = -1;

+ 10 - 6
Assembly-CSharp/SceneFreeModeSelectManager.cs

@@ -29,15 +29,19 @@ public class SceneFreeModeSelectManager : WfScreenManager
 			NDebug.Assert(this.adv_kag_.tag_backup.ContainsKey("scene_label_vip"), "SceneFreeModeSelectManagerにscene_label_everydayの設定がされていませんでした");
 			NDebug.Assert(this.adv_kag_.tag_backup.ContainsKey("yotogi_label"), "SceneFreeModeSelectManagerにyotogi_labelの設定がされていませんでした");
 			NDebug.Assert(this.adv_kag_.tag_backup.ContainsKey("cancel_label"), "SceneFreeModeSelectManagerにcancel_labelの設定がされていませんでした");
-			NDebug.Assert(this.adv_kag_.tag_backup.ContainsKey("scene_label_life_mode"), "SceneFreeModeSelectManagerにscene_label_life_modeの設定がされていませんでした");
-			NDebug.Assert(this.adv_kag_.tag_backup.ContainsKey("life_mode_chara_select"), "SceneFreeModeSelectManagerにlife_mode_chara_selectの設定がされていませんでした");
 			this.scene_label_mainstory_ = this.adv_kag_.tag_backup["scene_label_mainstory"];
 			this.scene_label_everyday_ = this.adv_kag_.tag_backup["scene_label_everyday"];
 			this.scene_label_vip_ = this.adv_kag_.tag_backup["scene_label_vip"];
 			this.yotogi_label_ = this.adv_kag_.tag_backup["yotogi_label"];
 			this.cancel_label_ = this.adv_kag_.tag_backup["cancel_label"];
-			this.scene_label_life_mode_ = this.adv_kag_.tag_backup["scene_label_life_mode"];
-			this.life_mode_chara_select_label_ = this.adv_kag_.tag_backup["life_mode_chara_select"];
+			if (this.adv_kag_.tag_backup.ContainsKey("scene_label_life_mode"))
+			{
+				this.scene_label_life_mode_ = this.adv_kag_.tag_backup["scene_label_life_mode"];
+			}
+			if (this.adv_kag_.tag_backup.ContainsKey("life_mode_chara_select"))
+			{
+				this.life_mode_chara_select_label_ = this.adv_kag_.tag_backup["life_mode_chara_select"];
+			}
 			this.is_life_mode_init = this.adv_kag_.tag_backup.ContainsKey("start_life_mode");
 		}
 		this.init_mgr_ = base.children_dic["Init"].GetComponent<FreeModeInit>();
@@ -400,9 +404,9 @@ public class SceneFreeModeSelectManager : WfScreenManager
 
 	private string cancel_label_;
 
-	private string scene_label_life_mode_;
+	private string scene_label_life_mode_ = string.Empty;
 
-	private string life_mode_chara_select_label_;
+	private string life_mode_chara_select_label_ = string.Empty;
 
 	[SerializeField]
 	private FreeModeItemEveryday.ScnearioType itemType;