Skip to content

Y
ygopro2
Commit 9272e379 authored by nanahira's avatar nanahira
Browse files
Options

Merge branch 'Android' of github.com:Unicorn369/ygopro2_droid into Android

parents 45b18f28 cb329106
Hide whitespace changes
Inline Side-by-side
Showing with 225 additions and 95 deletions
Assets/ArtSystem/WaterBlur.shader
View file @ 9272e379
...@@ -2,79 +2,204 @@ ...@@ -2,79 +2,204 @@
Shader "Custom/WaterBlur" { Shader "Custom/WaterBlur" {
Properties { Properties {
_blurSizeXY("BlurSizeXY", Range(0,10)) = 2 _blurSizeXY("BlurSizeXY", Range(0, 20)) = 1
} _Color("Main Color", Color) = (1, 1, 1, 1)
SubShader { _BumpAmt("Distortion", Range(0, 128)) = 10
// Draw ourselves after all opaque geometry _MainTex("Tint Color (RGB)", 2D) = "white" {}
Tags { "Queue" = "Transparent" } _BumpMap("Normalmap", 2D) = "bump" {}
// Grab the screen behind the object into _GrabTexture }
GrabPass { }
// Render the object with the texture generated above Category {
Pass { // We must be transparent, so other objects are drawn before this one.
Tags { "Queue"="Transparent" "IgnoreProjector"="True" "RenderType"="Opaque" }
CGPROGRAM
#pragma debug SubShader {
#pragma vertex vert // Horizontal blur
#pragma fragment frag GrabPass {
#pragma target 3.0 Tags { "LightMode" = "Always" }
sampler2D _GrabTexture : register(s0); }
float _blurSizeXY; Pass {
struct data { Tags { "LightMode" = "Always" }
float4 vertex : POSITION;
float3 normal : NORMAL; CGPROGRAM
}; #pragma vertex vert
#pragma fragment frag
struct v2f { #pragma fragmentoption ARB_precision_hint_fastest
float4 position : POSITION; #include "UnityCG.cginc"
float4 screenPos : TEXCOORD0;
}; struct appdata_t {
float4 vertex : POSITION;
v2f vert(data i){ float2 texcoord: TEXCOORD0;
v2f o; };
o.position = UnityObjectToClipPos(i.vertex);
o.screenPos = o.position; struct v2f {
return o; float4 vertex : POSITION;
} float4 uvgrab : TEXCOORD0;
};
half4 frag( v2f i ) : COLOR
{ v2f vert (appdata_t v) {
float2 screenPos = i.screenPos.xy / i.screenPos.w; v2f o;
float depth= _blurSizeXY*0.0005; o.vertex = UnityObjectToClipPos(v.vertex);
screenPos.x = (screenPos.x + 1) * 0.5; #if UNITY_UV_STARTS_AT_TOP
screenPos.y = 1-(screenPos.y + 1) * 0.5; float scale = -1.0;
half4 sum = half4(0.0h,0.0h,0.0h,0.0h); #else
sum += tex2D( _GrabTexture, float2(screenPos.x-5.0 * depth, screenPos.y+5.0 * depth)) * 0.025; float scale = 1.0;
sum += tex2D( _GrabTexture, float2(screenPos.x+5.0 * depth, screenPos.y-5.0 * depth)) * 0.025; #endif
o.uvgrab.xy = (float2(o.vertex.x, o.vertex.y * scale) + o.vertex.w) * 0.5;
sum += tex2D( _GrabTexture, float2(screenPos.x-4.0 * depth, screenPos.y+4.0 * depth)) * 0.05; o.uvgrab.zw = o.vertex.zw;
sum += tex2D( _GrabTexture, float2(screenPos.x+4.0 * depth, screenPos.y-4.0 * depth)) * 0.05; return o;
}
sum += tex2D( _GrabTexture, float2(screenPos.x-3.0 * depth, screenPos.y+3.0 * depth)) * 0.09;
sum += tex2D( _GrabTexture, float2(screenPos.x+3.0 * depth, screenPos.y-3.0 * depth)) * 0.09; sampler2D _GrabTexture;
float4 _GrabTexture_TexelSize;
sum += tex2D( _GrabTexture, float2(screenPos.x-2.0 * depth, screenPos.y+2.0 * depth)) * 0.12; float _blurSizeXY;
sum += tex2D( _GrabTexture, float2(screenPos.x+2.0 * depth, screenPos.y-2.0 * depth)) * 0.12;
half4 frag( v2f i ) : COLOR {
sum += tex2D( _GrabTexture, float2(screenPos.x-1.0 * depth, screenPos.y+1.0 * depth)) * 0.15; // half4 col = tex2Dproj( _GrabTexture, UNITY_PROJ_COORD(i.uvgrab));
sum += tex2D( _GrabTexture, float2(screenPos.x+1.0 * depth, screenPos.y-1.0 * depth)) * 0.15; // return col;
half4 sum = half4(0, 0, 0, 0);
sum += tex2D( _GrabTexture, screenPos-5.0 * depth) * 0.025; #define GRABPIXEL(weight,kernelx) tex2Dproj( _GrabTexture, UNITY_PROJ_COORD(float4(i.uvgrab.x + _GrabTexture_TexelSize.x * kernelx * _blurSizeXY, i.uvgrab.y, i.uvgrab.z, i.uvgrab.w))) * weight
sum += tex2D( _GrabTexture, screenPos-4.0 * depth) * 0.05; sum += GRABPIXEL(0.05, -4.0);
sum += tex2D( _GrabTexture, screenPos-3.0 * depth) * 0.09; sum += GRABPIXEL(0.09, -3.0);
sum += tex2D( _GrabTexture, screenPos-2.0 * depth) * 0.12; sum += GRABPIXEL(0.12, -2.0);
sum += tex2D( _GrabTexture, screenPos-1.0 * depth) * 0.15; sum += GRABPIXEL(0.15, -1.0);
sum += tex2D( _GrabTexture, screenPos) * 0.16; sum += GRABPIXEL(0.18, 0.0);
sum += tex2D( _GrabTexture, screenPos+5.0 * depth) * 0.15; sum += GRABPIXEL(0.15, +1.0);
sum += tex2D( _GrabTexture, screenPos+4.0 * depth) * 0.12; sum += GRABPIXEL(0.12, +2.0);
sum += tex2D( _GrabTexture, screenPos+3.0 * depth) * 0.09; sum += GRABPIXEL(0.09, +3.0);
sum += tex2D( _GrabTexture, screenPos+2.0 * depth) * 0.05; sum += GRABPIXEL(0.05, +4.0);
sum += tex2D( _GrabTexture, screenPos+1.0 * depth) * 0.025;
return sum;
return sum/2; }
} ENDCG
ENDCG }
// Vertical blur
GrabPass {
Tags { "LightMode" = "Always" }
}
Pass {
Tags { "LightMode" = "Always" }
CGPROGRAM
#pragma vertex vert
#pragma fragment frag
#pragma fragmentoption ARB_precision_hint_fastest
#include "UnityCG.cginc"
struct appdata_t {
float4 vertex : POSITION;
float2 texcoord: TEXCOORD0;
};
struct v2f {
float4 vertex : POSITION;
float4 uvgrab : TEXCOORD0;
};
v2f vert (appdata_t v) {
v2f o;
o.vertex = UnityObjectToClipPos(v.vertex);
#if UNITY_UV_STARTS_AT_TOP
float scale = -1.0;
#else
float scale = 1.0;
#endif
o.uvgrab.xy = (float2(o.vertex.x, o.vertex.y * scale) + o.vertex.w) * 0.5;
o.uvgrab.zw = o.vertex.zw;
return o;
}
sampler2D _GrabTexture;
float4 _GrabTexture_TexelSize;
float _blurSizeXY;
half4 frag( v2f i ) : COLOR {
// half4 col = tex2Dproj( _GrabTexture, UNITY_PROJ_COORD(i.uvgrab));
// return col;
half4 sum = half4(0, 0, 0, 0);
#define GRABPIXEL(weight,kernely) tex2Dproj( _GrabTexture, UNITY_PROJ_COORD(float4(i.uvgrab.x, i.uvgrab.y + _GrabTexture_TexelSize.y * kernely * _blurSizeXY, i.uvgrab.z, i.uvgrab.w))) * weight
//G(X) = (1/(sqrt(2 * PI * deviation * deviation))) * exp(-(x*x / (2 * deviation * deviation)))
sum += GRABPIXEL(0.05, -4.0);
sum += GRABPIXEL(0.09, -3.0);
sum += GRABPIXEL(0.12, -2.0);
sum += GRABPIXEL(0.15, -1.0);
sum += GRABPIXEL(0.18, 0.0);
sum += GRABPIXEL(0.15, +1.0);
sum += GRABPIXEL(0.12, +2.0);
sum += GRABPIXEL(0.09, +3.0);
sum += GRABPIXEL(0.05, +4.0);
return sum;
}
ENDCG
}
// Distortion
GrabPass {
Tags { "LightMode" = "Always" }
}
Pass {
Tags { "LightMode" = "Always" }
CGPROGRAM
#pragma vertex vert
#pragma fragment frag
#pragma fragmentoption ARB_precision_hint_fastest
#include "UnityCG.cginc"
struct appdata_t {
float4 vertex : POSITION;
float2 texcoord: TEXCOORD0;
};
struct v2f {
float4 vertex : POSITION;
float4 uvgrab : TEXCOORD0;
float2 uvbump : TEXCOORD1;
float2 uvmain : TEXCOORD2;
};
float _BumpAmt;
float4 _BumpMap_ST;
float4 _MainTex_ST;
v2f vert (appdata_t v) {
v2f o;
o.vertex = UnityObjectToClipPos(v.vertex);
#if UNITY_UV_STARTS_AT_TOP
float scale = -1.0;
#else
float scale = 1.0;
#endif
o.uvgrab.xy = (float2(o.vertex.x, o.vertex.y * scale) + o.vertex.w) * 0.5;
o.uvgrab.zw = o.vertex.zw;
o.uvbump = TRANSFORM_TEX( v.texcoord, _BumpMap );
o.uvmain = TRANSFORM_TEX( v.texcoord, _MainTex );
return o;
}
fixed4 _Color;
sampler2D _GrabTexture;
float4 _GrabTexture_TexelSize;
sampler2D _BumpMap;
sampler2D _MainTex;
half4 frag( v2f i ) : COLOR {
// calculate perturbed coordinates
half2 bump = UnpackNormal(tex2D( _BumpMap, i.uvbump )).rg; // we could optimize this by just reading the x y without reconstructing the Z
float2 offset = bump * _BumpAmt * _GrabTexture_TexelSize.xy;
i.uvgrab.xy = offset * i.uvgrab.z + i.uvgrab.xy;
half4 col = tex2Dproj( _GrabTexture, UNITY_PROJ_COORD(i.uvgrab));
half4 tint = tex2D( _MainTex, i.uvmain ) * _Color;
return col * tint;
}
ENDCG
}
} }
} }
Fallback Off
} }
\ No newline at end of file
Assets/ArtSystem/deckManager/new_search_remaster.prefab
View file @ 9272e379
...@@ -345,7 +345,7 @@ Transform: ...@@ -345,7 +345,7 @@ Transform:
m_PrefabInternal: {fileID: 100100000} m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 129162} m_GameObject: {fileID: 129162}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -64, y: 98, z: 0} m_LocalPosition: {x: 48, y: 98, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: m_Children:
- {fileID: 459346} - {fileID: 459346}
...@@ -433,7 +433,7 @@ Transform: ...@@ -433,7 +433,7 @@ Transform:
m_PrefabInternal: {fileID: 100100000} m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 169090} m_GameObject: {fileID: 169090}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 47, y: 98, z: 0} m_LocalPosition: {x: -64, y: 98, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: m_Children:
- {fileID: 411446} - {fileID: 411446}
...@@ -525,7 +525,7 @@ BoxCollider: ...@@ -525,7 +525,7 @@ BoxCollider:
m_IsTrigger: 1 m_IsTrigger: 1
m_Enabled: 1 m_Enabled: 1
serializedVersion: 2 serializedVersion: 2
m_Size: {x: 94, y: 36, z: 0} m_Size: {x: 95, y: 37, z: 0}
m_Center: {x: 0, y: 0, z: 0} m_Center: {x: 0, y: 0, z: 0}
--- !u!111 &11108840 --- !u!111 &11108840
Animation: Animation:
...@@ -717,7 +717,7 @@ MonoBehaviour: ...@@ -717,7 +717,7 @@ MonoBehaviour:
anchorOffset: 0 anchorOffset: 0
softBorderPadding: 1 softBorderPadding: 1
renderQueue: 0 renderQueue: 0
startingRenderQueue: 3005 startingRenderQueue: 3004
mClipTexture: {fileID: 0} mClipTexture: {fileID: 0}
mAlpha: 1 mAlpha: 1
mClipping: 4 mClipping: 4
...@@ -781,11 +781,11 @@ MonoBehaviour: ...@@ -781,11 +781,11 @@ MonoBehaviour:
leftAnchor: leftAnchor:
target: {fileID: 418574} target: {fileID: 418574}
relative: 1 relative: 1
absolute: -113 absolute: -224
rightAnchor: rightAnchor:
target: {fileID: 418574} target: {fileID: 418574}
relative: 1 relative: 1
absolute: -19 absolute: -129
bottomAnchor: bottomAnchor:
target: {fileID: 418574} target: {fileID: 418574}
relative: 0 relative: 0
...@@ -793,17 +793,17 @@ MonoBehaviour: ...@@ -793,17 +793,17 @@ MonoBehaviour:
topAnchor: topAnchor:
target: {fileID: 418574} target: {fileID: 418574}
relative: 1 relative: 1
absolute: -31 absolute: -30
updateAnchors: 1 updateAnchors: 1
mColor: {r: 1, g: 1, b: 1, a: 1} mColor: {r: 1, g: 1, b: 1, a: 1}
mPivot: 4 mPivot: 4
mWidth: 94 mWidth: 95
mHeight: 36 mHeight: 37
mDepth: 0 mDepth: 0
autoResizeBoxCollider: 1 autoResizeBoxCollider: 1
hideIfOffScreen: 0 hideIfOffScreen: 0
keepAspectRatio: 0 keepAspectRatio: 0
aspectRatio: 2.6111112 aspectRatio: 2.5675676
--- !u!114 &11438792 --- !u!114 &11438792
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 1 m_ObjectHideFlags: 1
...@@ -1151,11 +1151,11 @@ MonoBehaviour: ...@@ -1151,11 +1151,11 @@ MonoBehaviour:
leftAnchor: leftAnchor:
target: {fileID: 418574} target: {fileID: 418574}
relative: 1 relative: 1
absolute: -224 absolute: -113
rightAnchor: rightAnchor:
target: {fileID: 418574} target: {fileID: 418574}
relative: 1 relative: 1
absolute: -129 absolute: -18
bottomAnchor: bottomAnchor:
target: {fileID: 418574} target: {fileID: 418574}
relative: 0 relative: 0
...@@ -1347,8 +1347,8 @@ MonoBehaviour: ...@@ -1347,8 +1347,8 @@ MonoBehaviour:
updateAnchors: 1 updateAnchors: 1
mColor: {r: 0.98823535, g: 0.98823535, b: 0.98823535, a: 0.78431374} mColor: {r: 0.98823535, g: 0.98823535, b: 0.98823535, a: 0.78431374}
mPivot: 4 mPivot: 4
mWidth: 45 mWidth: 40
mHeight: 45 mHeight: 40
mDepth: 0 mDepth: 0
autoResizeBoxCollider: 0 autoResizeBoxCollider: 0
hideIfOffScreen: 0 hideIfOffScreen: 0
...@@ -1412,7 +1412,7 @@ MonoBehaviour: ...@@ -1412,7 +1412,7 @@ MonoBehaviour:
anchorOffset: 0 anchorOffset: 0
softBorderPadding: 1 softBorderPadding: 1
renderQueue: 0 renderQueue: 0
startingRenderQueue: 3005 startingRenderQueue: 3004
mClipTexture: {fileID: 0} mClipTexture: {fileID: 0}
mAlpha: 1 mAlpha: 1
mClipping: 3 mClipping: 3
......
Assets/SibylSystem/Menu/Menu.cs
View file @ 9272e379
...@@ -95,7 +95,11 @@ public class Menu : WindowServantSP ...@@ -95,7 +95,11 @@ public class Menu : WindowServantSP
Program.I().quit(); Program.I().quit();
Program.Running = false; Program.Running = false;
TcpHelper.SaveRecord(); TcpHelper.SaveRecord();
#if !UNITY_EDITOR || UNITY_ANDROID // IL2CPP 使用此方法才能退出
Application.Quit();
#elif
Process.GetCurrentProcess().Kill(); Process.GetCurrentProcess().Kill();
#endif
} }
void onClickOnline() void onClickOnline()
...@@ -144,16 +148,17 @@ public class Menu : WindowServantSP ...@@ -144,16 +148,17 @@ public class Menu : WindowServantSP
Application.OpenURL("https://github.com/Unicorn369/pro2_android_closeup/releases/tag/1.0"); Application.OpenURL("https://github.com/Unicorn369/pro2_android_closeup/releases/tag/1.0");
#elif UNITY_ANDROID //Android #elif UNITY_ANDROID //Android
AndroidJavaObject jo = new AndroidJavaObject("cn.unicorn369.library.API"); AndroidJavaObject jo = new AndroidJavaObject("cn.unicorn369.library.API");
if (!File.Exists("updates/closeup_version1.2.txt")) {//用于检查更新 if (!File.Exists("updates/closeup_version1.3.txt")) {//用于检查更新
if (File.Exists("closeup_version1.2.zip")) {//如果有则直接解压 if (File.Exists("closeup_version1.3.zip")) {//如果有则直接解压
jo.Call("doExtractZipFile", "closeup_version1.2.zip", Program.ANDROID_GAME_PATH); jo.Call("doExtractZipFile", "closeup_version1.3.zip", Program.ANDROID_GAME_PATH);
} else if (File.Exists("updates/closeup_version1.1.txt")){//如果有则下载更新包 } else if (File.Exists("updates/closeup_version1.2.txt")){//如果有则下载更新包
jo.Call("doDownloadZipFile", "https://github.com/Unicorn369/pro2_android_closeup/releases/download/1.0/up_closeup_version1.2.zip"); jo.Call("doDownloadZipFile", "https://github.com/Unicorn369/pro2_android_closeup/releases/download/1.0/up_closeup_version1.3.zip");
} else {//否则下载并解压，锁定目录：ANDROID_GAME_PATH } else {//否则下载并解压，锁定目录：ANDROID_GAME_PATH
jo.Call("doDownloadZipFile", "https://github.com/Unicorn369/pro2_android_closeup/releases/download/1.0/closeup_version1.2.zip"); jo.Call("doDownloadZipFile", "https://github.com/Unicorn369/pro2_android_closeup/releases/download/1.0/closeup_version1.3.zip");
} }
} else { } else {
jo.Call("showToast", "已下载，无需再次下载！"); jo.Call("showToast", "已是最新，无需再次下载！");
Program.PrintToChat(InterString.Get("已是最新，无需再次下载！"));
} }
#endif #endif
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment