Merged in Mac-Fixes (pull request #5)

Mac fixes

.vsconfig

@@ -0,0 +1,6 @@
+{
+  "version": "1.0",
+  "components": [
+    "Microsoft.VisualStudio.Workload.ManagedGame"
+  ]
+}

Assets/Resources/shader/sprite/Sprite Sub.shader

@@ -1,76 +1,65 @@
-Shader "QO/Sprite Sub" {
+// Upgrade NOTE: replaced 'mul(UNITY_MATRIX_MVP,*)' with 'UnityObjectToClipPos(*)'
-Properties {
- _MainTex ("Base (RGBA)", 2D) = "white" {}
- _Color ("Color", Color) = (1,1,1,1)
- _UVWH ("UVWH", Vector) = (0,0,1,1)
-}
-SubShader { 
- LOD 200
- Tags { "QUEUE"="Transparent" "RenderType"="Transparent" }
- Pass {
-  Tags { "QUEUE"="Transparent" "RenderType"="Transparent" }
-  Blend SrcAlpha One
- BlendOp RevSub
-Program "vp" {
-SubProgram "gles " {
-"!!GLES
 
+Shader "QO/Sprite Sub"
+{
+	Properties
+	{
+		_MainTex("Base (RGBA)", 2D) = "white" {}
+		_Color("Color", Color) = (1,1,1,1)
+		_UVWH("UVWH", Vector) = (0,0,1,1)
+	}
 
-#ifdef VERTEX
+		SubShader
+		{
+			LOD 200
 
-varying lowp vec2 xlv_TEXCOORD0;
+			Tags { "QUEUE" = "Transparent" "RenderType" = "Transparent" }
-uniform highp vec4 _UVWH;
+			Pass {
-uniform highp mat4 glstate_matrix_mvp;
+				Blend SrcAlpha OneMinusSrcAlpha
-attribute vec4 _glesMultiTexCoord0;
-attribute vec4 _glesVertex;
-void main ()
-{
-  lowp vec2 wh_1;
-  lowp vec2 uv_2;
-  lowp vec2 tmpvar_3;
-  highp vec2 tmpvar_4;
-  tmpvar_4 = _UVWH.xy;
-  uv_2 = tmpvar_4;
-  highp vec2 tmpvar_5;
-  tmpvar_5 = _UVWH.zw;
-  wh_1 = tmpvar_5;
-  highp vec2 tmpvar_6;
-  tmpvar_6 = ((_glesMultiTexCoord0.xy * wh_1) + uv_2);
-  tmpvar_3 = tmpvar_6;
-  gl_Position = (glstate_matrix_mvp * _glesVertex);
-  xlv_TEXCOORD0 = tmpvar_3;
-}
 
+				CGPROGRAM
+				#pragma vertex vert
+				#pragma fragment frag
 
+				#include "UnityCG.cginc"
 
-#endif
+				sampler2D _MainTex;
-#ifdef FRAGMENT
+				half4 _Color;
+				float4 _UVWH;
 
-varying lowp vec2 xlv_TEXCOORD0;
+				struct appdata_t
-uniform highp vec4 _Color;
+				{
-uniform sampler2D _MainTex;
+					float4 vertex : POSITION;
-void main ()
+					half4 color : COLOR;
-{
+					float2 texcoord : TEXCOORD0;
-  mediump vec4 tmpvar_1;
+				};
-  mediump vec4 texcol_2;
-  lowp vec4 tmpvar_3;
-  tmpvar_3 = texture2D (_MainTex, xlv_TEXCOORD0);
-  texcol_2 = tmpvar_3;
-  tmpvar_1 = (texcol_2 * _Color);
-  gl_FragData[0] = tmpvar_1;
-}
 
+				struct v2f
+				{
+					float4 vertex : POSITION;
+					half4 color : COLOR;
+					float2 texcoord : TEXCOORD0;
+				};
 
+				v2f vert(appdata_t v)
+				{
+					v2f o;
+					float2 uv_2 = _UVWH.xy;
+					float2 wh_1 = _UVWH.zw;
+					o.color = v.color;
+					o.vertex = UnityObjectToClipPos(v.vertex);
+					o.texcoord = ((v.texcoord * wh_1) + uv_2);
+					return o;
+				}
 
-#endif"
+				half4 frag(v2f IN) : COLOR
-}
+				{
-}
+					  float4 tex = tex2D(_MainTex, IN.texcoord);
-Program "fp" {
+					  float4 tmpvar_1 = (tex * _Color);
-SubProgram "gles " {
+					return tmpvar_1;
-"!!GLES"
+				}
-}
+				ENDCG
-}
+			}
- }
+		}
-}
+			Fallback Off
-Fallback "Diffuse"
 }

Assets/Scripts/Assembly-CSharp/Man2D.cs

@@ -35,7 +35,7 @@ public class Man2D : Singleton<Man2D>
 		this.CreateSpriteManager();
 		this.m_Texture = base.gameObject.AddComponent<ManTexture>();
 		this.CreateFrameBuffer();
-		this.m_BackSprite = this.AddSprite(string.Empty);
+		/*this.m_BackSprite = this.AddSprite(string.Empty);
 		this.m_BackSprite.z = 0;
 		this.m_BackSprite.w = this.m_nScreenW;
 		this.m_BackSprite.h = this.m_nScreenH;
@@ -43,7 +43,7 @@ public class Man2D : Singleton<Man2D>
 		this.m_BackSprite.G = 0;
 		this.m_BackSprite.B = 0;
 		this.m_BackSprite.A = byte.MaxValue;
-		this.m_BackSprite.Brend = SPRITE_DRAW_MODE.BACK;
+		this.m_BackSprite.Brend = SPRITE_DRAW_MODE.BACK;*/
 		base.enabled = false;
 	}
 

Assets/Scripts/Assembly-CSharp/Pathing.cs

@@ -21,7 +21,8 @@ public static class Pathing
 	{
 		get
 		{
-			return Pathing.appContentDataUri.ToString();
+            //return Pathing.appContentDataUri.ToString();
+			return "file://localhost/" + Application.streamingAssetsPath;
 		}
 	}
 

Packages/manifest.json

@@ -1,12 +1,12 @@
 {
   "dependencies": {
-    "com.unity.collab-proxy": "1.15.7",
+    "com.unity.collab-proxy": "1.17.2",
-    "com.unity.ide.rider": "3.0.9",
+    "com.unity.ide.rider": "3.0.15",
-    "com.unity.ide.visualstudio": "2.0.12",
+    "com.unity.ide.visualstudio": "2.0.16",
-    "com.unity.ide.vscode": "1.2.4",
+    "com.unity.ide.vscode": "1.2.5",
-    "com.unity.test-framework": "1.1.29",
+    "com.unity.test-framework": "1.1.31",
     "com.unity.textmeshpro": "3.0.6",
-    "com.unity.timeline": "1.6.3",
+    "com.unity.timeline": "1.6.4",
     "com.unity.toolchain.win-x86_64-linux-x86_64": "1.0.0",
     "com.unity.ugui": "1.0.0",
     "com.unity.modules.ai": "1.0.0",

Packages/packages-lock.json

@@ -1,11 +1,10 @@
 {
   "dependencies": {
     "com.unity.collab-proxy": {
-      "version": "1.15.7",
+      "version": "1.17.2",
       "depth": 0,
       "source": "registry",
       "dependencies": {
-        "com.unity.nuget.newtonsoft-json": "2.0.0",
         "com.unity.services.core": "1.0.1"
       },
       "url": "https://packages.unity.com"
@@ -18,7 +17,7 @@
       "url": "https://packages.unity.com"
     },
     "com.unity.ide.rider": {
-      "version": "3.0.9",
+      "version": "3.0.15",
       "depth": 0,
       "source": "registry",
       "dependencies": {
@@ -27,7 +26,7 @@
       "url": "https://packages.unity.com"
     },
     "com.unity.ide.visualstudio": {
-      "version": "2.0.12",
+      "version": "2.0.16",
       "depth": 0,
       "source": "registry",
       "dependencies": {
@@ -36,25 +35,27 @@
       "url": "https://packages.unity.com"
     },
     "com.unity.ide.vscode": {
-      "version": "1.2.4",
+      "version": "1.2.5",
       "depth": 0,
       "source": "registry",
       "dependencies": {},
       "url": "https://packages.unity.com"
     },
     "com.unity.nuget.newtonsoft-json": {
-      "version": "2.0.0",
+      "version": "3.0.2",
-      "depth": 1,
+      "depth": 2,
       "source": "registry",
       "dependencies": {},
       "url": "https://packages.unity.com"
     },
     "com.unity.services.core": {
-      "version": "1.0.1",
+      "version": "1.4.2",
       "depth": 1,
       "source": "registry",
       "dependencies": {
-        "com.unity.modules.unitywebrequest": "1.0.0"
+        "com.unity.modules.unitywebrequest": "1.0.0",
+        "com.unity.nuget.newtonsoft-json": "3.0.2",
+        "com.unity.modules.androidjni": "1.0.0"
       },
       "url": "https://packages.unity.com"
     },
@@ -75,7 +76,7 @@
       "url": "https://packages.unity.com"
     },
     "com.unity.test-framework": {
-      "version": "1.1.29",
+      "version": "1.1.31",
       "depth": 0,
       "source": "registry",
       "dependencies": {
@@ -95,7 +96,7 @@
       "url": "https://packages.unity.com"
     },
     "com.unity.timeline": {
-      "version": "1.6.3",
+      "version": "1.6.4",
       "depth": 0,
       "source": "registry",
       "dependencies": {

ProjectSettings/ProjectVersion.txt

@@ -1,2 +1,2 @@
-m_EditorVersion: 2021.2.10f1
+m_EditorVersion: 2021.3.10f1
-m_EditorVersionWithRevision: 2021.2.10f1 (ee872746220e)
+m_EditorVersionWithRevision: 2021.3.10f1 (1c7d0df0160b)

unityshinsoubanalice-csharp.sln

@@ -1,40 +0,0 @@
-Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual Studio 2008
-
-Project("{F49C4458-A18F-61D2-2434-21FA1E281883}") = "unityshinsoubanalice", "Assembly-CSharp-vs.csproj", "{8064C318-980D-5E6D-F7D0-C6A8C4DBEB3C}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Release|Any CPU = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{8064C318-980D-5E6D-F7D0-C6A8C4DBEB3C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{8064C318-980D-5E6D-F7D0-C6A8C4DBEB3C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{8064C318-980D-5E6D-F7D0-C6A8C4DBEB3C}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{8064C318-980D-5E6D-F7D0-C6A8C4DBEB3C}.Release|Any CPU.Build.0 = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-																																																																		GlobalSection(MonoDevelopProperties) = preSolution
-		StartupItem = Assembly-CSharp.csproj
-		Policies = $0
-		$0.TextStylePolicy = $1
-		$1.inheritsSet = null
-		$1.scope = text/x-csharp
-		$0.CSharpFormattingPolicy = $2
-		$2.inheritsSet = Mono
-		$2.inheritsScope = text/x-csharp
-		$2.scope = text/x-csharp
-		$0.TextStylePolicy = $3
-		$3.FileWidth = 120
-		$3.TabWidth = 4
-		$3.IndentWidth = 4
-		$3.EolMarker = Unix
-		$3.inheritsSet = Mono
-		$3.inheritsScope = text/plain
-		$3.scope = text/plain
-	EndGlobalSection
-
-EndGlobal

unityshinsoubanalice.sln

@@ -1,40 +0,0 @@
-Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual Studio 2008
-
-Project("{F49C4458-A18F-61D2-2434-21FA1E281883}") = "unityshinsoubanalice", "Assembly-CSharp.csproj", "{8064C318-980D-5E6D-F7D0-C6A8C4DBEB3C}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Release|Any CPU = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{8064C318-980D-5E6D-F7D0-C6A8C4DBEB3C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{8064C318-980D-5E6D-F7D0-C6A8C4DBEB3C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{8064C318-980D-5E6D-F7D0-C6A8C4DBEB3C}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{8064C318-980D-5E6D-F7D0-C6A8C4DBEB3C}.Release|Any CPU.Build.0 = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-																																																																	GlobalSection(MonoDevelopProperties) = preSolution
-		StartupItem = Assembly-CSharp.csproj
-		Policies = $0
-		$0.TextStylePolicy = $1
-		$1.inheritsSet = null
-		$1.scope = text/x-csharp
-		$0.CSharpFormattingPolicy = $2
-		$2.inheritsSet = Mono
-		$2.inheritsScope = text/x-csharp
-		$2.scope = text/x-csharp
-		$0.TextStylePolicy = $3
-		$3.FileWidth = 120
-		$3.TabWidth = 4
-		$3.IndentWidth = 4
-		$3.EolMarker = Unix
-		$3.inheritsSet = Mono
-		$3.inheritsScope = text/plain
-		$3.scope = text/plain
-	EndGlobalSection
-
-EndGlobal

unityshinsoubanalice.userprefs

@@ -1,22 +0,0 @@
-<Properties>
-  <MonoDevelop.Ide.Workspace ActiveConfiguration="Debug" PreferredExecutionTarget="MonoDevelop.Default" />
-  <MonoDevelop.Ide.Workbench ActiveDocument="Assets\Scripts\Assembly-CSharp\Man2D.cs">
-    <Files>
-      <File FileName="Assets\Scripts\Assembly-CSharp\Man2D.cs" Line="317" Column="23" />
-      <File FileName="Assets\Scripts\Assembly-CSharp\UnityGraph.cs" Line="87" Column="3" />
-      <File FileName="Assets\Scripts\Assembly-CSharp\EffectManager.cs" Line="179" Column="3" />
-      <File FileName="Assets\Scripts\Assembly-CSharp\ManTexture.cs" Line="59" Column="4" />
-    </Files>
-  </MonoDevelop.Ide.Workbench>
-  <MonoDevelop.Ide.DebuggingService.Breakpoints>
-    <BreakpointStore>
-      <Breakpoint enabled="false" file="C:\Users\lovel\Documents\unityshinsoubanalice\Assets\Scripts\Assembly-CSharp\MsgWnd.cs" line="316" />
-      <Breakpoint enabled="false" file="C:\Users\lovel\Documents\unityshinsoubanalice\Assets\Scripts\Assembly-CSharp\Qoo\Ks\KsScene.cs" line="846" />
-      <Breakpoint enabled="false" file="C:\Users\lovel\Documents\unityshinsoubanalice\Assets\Scripts\Assembly-CSharp\Qoo\Ks\KsTagInfo_PRINT.cs" line="30" />
-      <Breakpoint enabled="false" file="C:\Users\lovel\Documents\unityshinsoubanalice\Assets\Scripts\Assembly-CSharp\Pathing.cs" line="55" />
-      <Breakpoint file="C:\Users\lovel\Documents\unityshinsoubanalice\Assets\Scripts\Assembly-CSharp\UnitySprite.cs" line="372" />
-      <Breakpoint file="C:\Users\lovel\Documents\unityshinsoubanalice\Assets\Scripts\Assembly-CSharp\UnityGraph.cs" line="330" />
-    </BreakpointStore>
-  </MonoDevelop.Ide.DebuggingService.Breakpoints>
-  <MonoDevelop.Ide.DebuggingService.PinnedWatches />
-</Properties>

unityshinsoubanheart.sln

@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Assembly-CSharp", "Assembly-CSharp.csproj", "{1084AC06-10AB-1CD5-2AF3-10FEEFEE7232}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Assembly-CSharp", "Assembly-CSharp.csproj", "{898885DA-9B00-E504-B00E-81386AF5A377}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -9,10 +9,10 @@ Global
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{1084AC06-10AB-1CD5-2AF3-10FEEFEE7232}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{898885DA-9B00-E504-B00E-81386AF5A377}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{1084AC06-10AB-1CD5-2AF3-10FEEFEE7232}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{898885DA-9B00-E504-B00E-81386AF5A377}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{1084AC06-10AB-1CD5-2AF3-10FEEFEE7232}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{898885DA-9B00-E504-B00E-81386AF5A377}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{1084AC06-10AB-1CD5-2AF3-10FEEFEE7232}.Release|Any CPU.Build.0 = Release|Any CPU
+		{898885DA-9B00-E504-B00E-81386AF5A377}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE