Skip to content

Y
ygopro2
Commit d8d6f2c2 authored by Unicorn369's avatar Unicorn369
Browse files
Options

Merge branch 'Test' of https://github.com/Unicorn369/YGOPro2_Droid into Android

parents 4b4d7855 dfca82e4
Hide whitespace changes
Inline Side-by-side
Showing with 191 additions and 106 deletions
Assets/ArtSystem/gameInfo/gameInfo.cs
View file @ d8d6f2c2
......@@ -7,6 +7,8 @@ public class gameUIbutton
public string hashString;
public GameObject gameObject;
public int response;
public bool dying;
public bool dead;
}
public class gameInfo : MonoBehaviour
......@@ -120,25 +122,41 @@ public class gameInfo : MonoBehaviour
opponent.transform.localPosition = new Vector3(Screen.width / 2 - 14, Screen.height / 2 - 14 - k * (float)(opponent.under.height));
}
float height = 198 + 75 * (HashedButtons.Count);
if (HashedButtons.Count == 0)
{
height = 174;
}
width = (225 * kb) + 15f;
width = (225 * kb) + 15f;
float localPositionPanX = (((float)Screen.width - 225 * kb) / 2) - 15f;
float localPositionPanY = 0;
float localPositionPanY_ = instance_btnPan.transform.localPosition.y + (localPositionPanY - instance_btnPan.transform.localPosition.y) * 0.2f;
instance_btnPan.height += (int)(((float)height - (float)instance_btnPan.height) * 0.2f);
instance_btnPan.transform.localPosition = new Vector3(localPositionPanX, localPositionPanY_, 0);
instance_lab.transform.localPosition = new Vector3(Screen.width/ 2 - 315, -Screen.height / 2 + 90, 0);
instance_btnPan.transform.localPosition = new Vector3(localPositionPanX, 120, 0);
instance_lab.transform.localPosition = new Vector3(Screen.width / 2 - 315, -Screen.height / 2 + 90, 0);
int j = 0;
for (int i = 0; i < HashedButtons.Count; i++)
{
if (HashedButtons[i].gameObject != null)
{
HashedButtons[i].gameObject.transform.localPosition += (new Vector3(0, height / 2 - 220 - i * 75, 0) - HashedButtons[i].gameObject.transform.localPosition) * Program.deltaTime * 10f;
if (HashedButtons[i].dying)
{
HashedButtons[i].gameObject.transform.localPosition += (new Vector3(0, -120, 0) - HashedButtons[i].gameObject.transform.localPosition) * Program.deltaTime * 20f;
if (Math.Abs(HashedButtons[i].gameObject.transform.localPosition.y - -120) < 1)
HashedButtons[i].dead = true;
}
else
{
HashedButtons[i].gameObject.transform.localPosition += (new Vector3(0, -220 - j * 75, 0) - HashedButtons[i].gameObject.transform.localPosition) * Program.deltaTime * 10f;
j++;
}
}
else
HashedButtons[i].dead = true;
}
for (int i = HashedButtons.Count - 1; i >= 0; i--)
{
if (HashedButtons[i].dead)
HashedButtons.RemoveAt(i);
}
float height = 198 + 75 * j;
if (j == 0)
{
height = 174;
}
instance_btnPan.height += (int)(((float)height - (float)instance_btnPan.height) * 0.2f);
if (Program.TimePassed() - lastTickTime > 1000)
{
lastTickTime = Program.TimePassed();
......@@ -171,9 +189,10 @@ public class gameInfo : MonoBehaviour
}
hashedButton.gameObject.transform.SetParent(instance_btnPan.transform,false);
hashedButton.gameObject.transform.localScale = Vector3.zero;
hashedButton.gameObject.transform.localPosition= Vector3.zero;
hashedButton.gameObject.transform.localPosition= new Vector3(0, -120, 0);
hashedButton.gameObject.transform.localEulerAngles = Vector3.zero;
iTween.ScaleTo(hashedButton.gameObject, new Vector3(0.9f, 0.9f, 0.9f), 0.3f);
hashedButton.dying = false;
HashedButtons.Add(hashedButton);
refreshLine();
}
......@@ -222,9 +241,9 @@ public class gameInfo : MonoBehaviour
{
if (remove.gameObject != null)
{
Program.I().destroy(remove.gameObject, 0.6f, true);
Program.I().destroy(remove.gameObject, 0.3f, true);
}
HashedButtons.Remove(remove);
remove.dying = true;
}
refreshLine();
}
......@@ -242,16 +261,24 @@ public class gameInfo : MonoBehaviour
{
if (HashedButtons[i].gameObject != null)
{
Program.I().destroy(HashedButtons[i].gameObject, 0.6f, true);
Program.I().destroy(HashedButtons[i].gameObject, 0.3f, true);
}
HashedButtons[i].dying = true;
}
HashedButtons.Clear();
refreshLine();
}
void refreshLine()
{
line.SetActive(HashedButtons.Count > 0);
int j = 0;
for (int i = 0; i < HashedButtons.Count; i++)
{
if (!HashedButtons[i].dying)
{
j++;
}
}
line.SetActive(j > 0);
}
int[] time = new int[2];
......@@ -303,8 +330,16 @@ public class gameInfo : MonoBehaviour
opponent.under.mainTexture = GameTextureManager.exBar;
me.under.mainTexture = GameTextureManager.bar;
}
me.api_timeHint.text = "paused";
opponent.api_timeHint.text = "paused";
if (Program.I().ocgcore.timeLimit == 0)
{
me.api_timeHint.text = "infinite";
opponent.api_timeHint.text = "infinite";
}
else
{
me.api_timeHint.text = "paused";
opponent.api_timeHint.text = "paused";
}
}
public bool amIdanger()
......@@ -314,6 +349,10 @@ public class gameInfo : MonoBehaviour
void setTimeAbsolutely(int player, int t)
{
if (Program.I().ocgcore.timeLimit == 0)
{
return;
}
if (player == 0)
{
me.api_timeHint.text = t.ToString() + "/" + Program.I().ocgcore.timeLimit.ToString();
......
Assets/ArtSystem/gameInfo/new_gameInfoRemaster.prefab
View file @ d8d6f2c2
......@@ -321,7 +321,7 @@ Transform:
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 179438}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -97, y: 30, z: 0}
m_LocalPosition: {x: -97, y: -38, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 481814}
......@@ -363,7 +363,7 @@ Transform:
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 114238}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -97, y: -66, z: 0}
m_LocalPosition: {x: -97, y: -134, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 400434}
......@@ -379,7 +379,7 @@ Transform:
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 171338}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: -97, z: 0}
m_LocalPosition: {x: 0, y: -165, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 498562}
......@@ -418,7 +418,7 @@ Transform:
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 147310}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -97, y: -20, z: 0}
m_LocalPosition: {x: -97, y: -86, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 451638}
......@@ -499,7 +499,7 @@ Transform:
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 104964}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 126, z: 0}
m_LocalPosition: {x: 0, y: 129, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 411346}
......@@ -519,8 +519,8 @@ BoxCollider:
m_IsTrigger: 1
m_Enabled: 1
serializedVersion: 2
m_Size: {x: 240, y: 48, z: 0}
m_Center: {x: 120, y: 0, z: 0}
m_Size: {x: 270, y: 48, z: 0}
m_Center: {x: 135, y: 0, z: 0}
--- !u!65 &6532536
BoxCollider:
m_ObjectHideFlags: 1
......@@ -543,8 +543,8 @@ BoxCollider:
m_IsTrigger: 1
m_Enabled: 1
serializedVersion: 2
m_Size: {x: 240, y: 44, z: 0}
m_Center: {x: 120, y: 0, z: 0}
m_Size: {x: 270, y: 48, z: 0}
m_Center: {x: 135, y: 0, z: 0}
--- !u!65 &6583438
BoxCollider:
m_ObjectHideFlags: 1
......@@ -555,8 +555,8 @@ BoxCollider:
m_IsTrigger: 1
m_Enabled: 1
serializedVersion: 2
m_Size: {x: 240, y: 48, z: 0}
m_Center: {x: 120, y: 0, z: 0}
m_Size: {x: 270, y: 48, z: 0}
m_Center: {x: 135, y: 0, z: 0}
--- !u!111 &11101560
Animation:
m_ObjectHideFlags: 1
......@@ -676,7 +676,7 @@ MonoBehaviour:
rightAnchor:
target: {fileID: 498562}
relative: 1
absolute: 35
absolute: 65
bottomAnchor:
target: {fileID: 498562}
relative: 1
......@@ -684,17 +684,17 @@ MonoBehaviour:
topAnchor:
target: {fileID: 498562}
relative: 1
absolute: -66
absolute: -62
updateAnchors: 1
mColor: {r: 1, g: 1, b: 1, a: 1}
mPivot: 3
mWidth: 240
mHeight: 44
mWidth: 270
mHeight: 48
mDepth: 6
autoResizeBoxCollider: 1
hideIfOffScreen: 0
keepAspectRatio: 0
aspectRatio: 5.4545455
aspectRatio: 5.625
--- !u!114 &11407804
MonoBehaviour:
m_ObjectHideFlags: 1
......@@ -725,13 +725,13 @@ MonoBehaviour:
updateAnchors: 1
mColor: {r: 1, g: 1, b: 1, a: 1}
mPivot: 3
mWidth: 180
mHeight: 46
mWidth: 210
mHeight: 50
mDepth: 9
autoResizeBoxCollider: 0
hideIfOffScreen: 0
keepAspectRatio: 0
aspectRatio: 3.9130435
aspectRatio: 4.2
keepCrispWhenShrunk: 1
mTrueTypeFont: {fileID: 12800000, guid: f775853fdfd14bb47934543e95c3bae3, type: 3}
mFont: {fileID: 0}
......@@ -999,7 +999,7 @@ MonoBehaviour:
rightAnchor:
target: {fileID: 498562}
relative: 1
absolute: 35
absolute: 65
bottomAnchor:
target: {fileID: 498562}
relative: 1
......@@ -1011,13 +1011,13 @@ MonoBehaviour:
updateAnchors: 1
mColor: {r: 1, g: 1, b: 1, a: 1}
mPivot: 3
mWidth: 240
mWidth: 270
mHeight: 48
mDepth: 6
autoResizeBoxCollider: 1
hideIfOffScreen: 0
keepAspectRatio: 0
aspectRatio: 5
aspectRatio: 5.625
--- !u!114 &11430404
MonoBehaviour:
m_ObjectHideFlags: 1
......@@ -1218,29 +1218,29 @@ MonoBehaviour:
leftAnchor:
target: {fileID: 498562}
relative: 0
absolute: -12
absolute: 11
rightAnchor:
target: {fileID: 498562}
relative: 1
absolute: 12
absolute: -11
bottomAnchor:
target: {fileID: 498562}
relative: 1
absolute: -175
absolute: -172
topAnchor:
target: {fileID: 498562}
relative: 1
absolute: -155
absolute: -158
updateAnchors: 1
mColor: {r: 1, g: 1, b: 1, a: 1}
mPivot: 4
mWidth: 240
mHeight: 20
mWidth: 194
mHeight: 14
mDepth: 0
autoResizeBoxCollider: 0
hideIfOffScreen: 0
keepAspectRatio: 0
aspectRatio: 12
aspectRatio: 13.857142
mType: 0
mFillDirection: 4
mFillAmount: 1
......@@ -1361,13 +1361,13 @@ MonoBehaviour:
updateAnchors: 1
mColor: {r: 1, g: 1, b: 1, a: 0}
mPivot: 4
mWidth: 50
mHeight: 55
mWidth: 51
mHeight: 54
mDepth: 8
autoResizeBoxCollider: 0
hideIfOffScreen: 0
keepAspectRatio: 0
aspectRatio: 0.90909094
aspectRatio: 0.9444444
mType: 0
mFillDirection: 4
mFillAmount: 1
......@@ -1424,7 +1424,7 @@ MonoBehaviour:
absolute: 0
updateAnchors: 1
mColor: {r: 1, g: 1, b: 1, a: 1}
mPivot: 4
mPivot: 1
mWidth: 216
mHeight: 135
mDepth: 0
......@@ -1603,13 +1603,13 @@ MonoBehaviour:
updateAnchors: 1
mColor: {r: 1, g: 1, b: 1, a: 0}
mPivot: 4
mWidth: 50
mHeight: 55
mWidth: 51
mHeight: 54
mDepth: 8
autoResizeBoxCollider: 0
hideIfOffScreen: 0
keepAspectRatio: 0
aspectRatio: 0.90909094
aspectRatio: 0.9444444
mType: 0
mFillDirection: 4
mFillAmount: 1
......@@ -1653,13 +1653,13 @@ MonoBehaviour:
updateAnchors: 1
mColor: {r: 1, g: 1, b: 1, a: 1}
mPivot: 3
mWidth: 180
mWidth: 210
mHeight: 50
mDepth: 9
autoResizeBoxCollider: 0
hideIfOffScreen: 0
keepAspectRatio: 0
aspectRatio: 3.6
aspectRatio: 4.2
keepCrispWhenShrunk: 1
mTrueTypeFont: {fileID: 12800000, guid: f775853fdfd14bb47934543e95c3bae3, type: 3}
mFont: {fileID: 0}
......@@ -1760,13 +1760,13 @@ MonoBehaviour:
updateAnchors: 1
mColor: {r: 1, g: 1, b: 1, a: 0}
mPivot: 4
mWidth: 50
mHeight: 55
mWidth: 51
mHeight: 54
mDepth: 8
autoResizeBoxCollider: 0
hideIfOffScreen: 0
keepAspectRatio: 0
aspectRatio: 0.90909094
aspectRatio: 0.9444444
mType: 0
mFillDirection: 4
mFillAmount: 1
......@@ -1892,13 +1892,13 @@ MonoBehaviour:
updateAnchors: 1
mColor: {r: 1, g: 1, b: 1, a: 1}
mPivot: 3
mWidth: 180
mWidth: 210
mHeight: 50
mDepth: 9
autoResizeBoxCollider: 0
hideIfOffScreen: 0
keepAspectRatio: 0
aspectRatio: 3.6
aspectRatio: 4.2
keepCrispWhenShrunk: 1
mTrueTypeFont: {fileID: 12800000, guid: f775853fdfd14bb47934543e95c3bae3, type: 3}
mFont: {fileID: 0}
......@@ -1988,7 +1988,7 @@ MonoBehaviour:
rightAnchor:
target: {fileID: 498562}
relative: 1
absolute: 35
absolute: 65
bottomAnchor:
target: {fileID: 498562}
relative: 1
......@@ -2000,13 +2000,13 @@ MonoBehaviour:
updateAnchors: 1
mColor: {r: 1, g: 1, b: 1, a: 1}
mPivot: 3
mWidth: 240
mWidth: 270
mHeight: 48
mDepth: 6
autoResizeBoxCollider: 1
hideIfOffScreen: 0
keepAspectRatio: 0
aspectRatio: 5
aspectRatio: 5.625
--- !u!114 &11495680
MonoBehaviour:
m_ObjectHideFlags: 1
......
Assets/SibylSystem/Ocgcore/Ocgcore.cs
View file @ d8d6f2c2
......@@ -372,13 +372,13 @@ public class Ocgcore : ServantWithCardDescription
if (c != null)
{
int pposition = c.overFatherCount - 1 - p.position;
return_value.y -= (pposition + 2) * 1f;
return_value.x += (pposition + 1) * 0.6f;
return_value.y -= (pposition + 2) * 0.25f;
return_value.x += (pposition + 1) * 0.15f;
}
else
{
return_value.y -= (p.position + 2) * 1f;
return_value.x += (p.position + 1) * 0.6f;
return_value.y -= (p.position + 2) * 0.25f;
return_value.x += (p.position + 1) * 0.15f;
}
}
......@@ -1318,7 +1318,8 @@ public class Ocgcore : ServantWithCardDescription
isFirst = ((playertype & 0xf) > 0) ? false : true;
gameInfo.swaped = false;
isObserver = ((playertype & 0xf0) > 0) ? true : false;
r.ReadByte(); // duel_rule
if (r.BaseStream.Length > 17) // dumb fix for yrp3d replay older than v1.034.9
r.ReadByte(); // duel_rule
life_0 = r.ReadInt32();
life_1 = r.ReadInt32();
lpLimit = life_0;
......@@ -1794,17 +1795,21 @@ public class Ocgcore : ServantWithCardDescription
break;
case GameMessage.HandResult:
data = r.ReadByte();
int data1 = data & 0x3;
int data2 = (data >> 2) & 0x3;
string scissors = InterString.Get("剪刀");
string rock = InterString.Get("石头");
string paper = InterString.Get("布");
string res1 = (data1 == 1 ? scissors : (data1 == 2 ? paper : rock));
string res2 = (data2 == 1 ? scissors : (data2 == 2 ? paper : rock));
int res1 = (data & 0x3) - 1;
int res2 = ((data >> 2) & 0x3) - 1;
if (isFirst)
printDuelLog(InterString.Get("猜拳结果：你好像出了") + res2 + InterString.Get("，对方好像出了") + res1);
{
Program.I().new_ui_handShower.GetComponent<handShower>().me = res1;
Program.I().new_ui_handShower.GetComponent<handShower>().op = res2;
}
else
printDuelLog(InterString.Get("猜拳结果：你好像出了") + res1 + InterString.Get("，对方好像出了") + res2);
{
Program.I().new_ui_handShower.GetComponent<handShower>().me = res2;
Program.I().new_ui_handShower.GetComponent<handShower>().op = res1;
}
GameObject handres = create(Program.I().new_ui_handShower, Vector3.zero, Vector3.zero, false, Program.ui_main_2d);
destroy(handres, 10f);
Sleep(60);
break;
case GameMessage.Attack:
game_card = GCS_cardGet(r.ReadGPS(), false);
......@@ -4169,9 +4174,20 @@ public class Ocgcore : ServantWithCardDescription
}
break;
case GameMessage.RockPaperScissors:
binaryMaster = new BinaryMaster();
binaryMaster.writer.Write(UnityEngine.Random.Range(0, 2));
sendReturn(binaryMaster.get());
if (inIgnoranceReplay() || inTheWorld())
{
break;
}
if (condition == Condition.record)
{
Sleep(60);
}
destroy(waitObject, 0, false, true);
player = localPlayer(r.ReadByte());
RMSshow_tp("RockPaperScissors"
, new messageSystemValue { hint = "jiandao", value = "1" }
, new messageSystemValue { hint = "shitou", value = "2" }
, new messageSystemValue { hint = "bu", value = "3" });
break;
case GameMessage.ConfirmDecktop:
player = localPlayer(r.ReadByte());
......@@ -8804,6 +8820,20 @@ public class Ocgcore : ServantWithCardDescription
}
}
break;
case "RockPaperScissors":
{
try
{
binaryMaster = new BinaryMaster();
binaryMaster.writer.Write(Int32.Parse(result[0].value));
sendReturn(binaryMaster.get());
}
catch (Exception e)
{
Debug.Log(e);
}
}
break;
}
}
......
Assets/SibylSystem/Program.cs
View file @ d8d6f2c2
......@@ -1081,7 +1081,7 @@ public class Program : MonoBehaviour
_padScroll = 0;
}
GUI.Label(new Rect(10, 5, 200, 200), "[Ver 2.2.4] " + "FPS: " + m_FPS);
GUI.Label(new Rect(10, 5, 200, 200), "[Ver 2.2.5] " + "FPS: " + m_FPS);
}
void Update()
......
Assets/SibylSystem/Servant.cs
View file @ d8d6f2c2
using UnityEngine;
using System;
using System.Collections.Generic;
using YGOSharp.OCGWrapper.Enums;
public class Servant
{
public GameObject gameObject;
......@@ -693,14 +695,24 @@ public class Servant
UIHelper.registEvent(currentMSwindow, "atk_", ES_RMSpremono, atk);
UIHelper.registEvent(currentMSwindow, "def_", ES_RMSpremono, def);
UITexture atkpic = UIHelper.getByName<UITexture>(currentMSwindow, "atkPic_");
UIButton defbutton = UIHelper.getByName<UIButton>(currentMSwindow, "def_");
if (Int32.Parse(atk.value) == (int)CardPosition.FaceUpDefence)
{
atkpic.transform.localRotation = Quaternion.Euler(0f, 0f, 90f);
defbutton.transform.localPosition = new Vector3(72.8f, 2f, 0f);
}
else
{
atkpic.transform.localRotation = Quaternion.Euler(0f, 0f, 0f);
defbutton.transform.localPosition = new Vector3(62.8f, 0f, 0f);
}
cardPicLoader cardPicLoader_ = currentMSwindow.AddComponent<cardPicLoader>();
cardPicLoader_.code = code;
cardPicLoader_.uiTexture = UIHelper.getByName<UITexture>(currentMSwindow, "atkPic_");
cardPicLoader_.uiTexture = atkpic;
cardPicLoader_ = currentMSwindow.AddComponent<cardPicLoader>();
if (Int32.Parse(def.value) != 8)
cardPicLoader_.code = code;
else
cardPicLoader_.code = 0;
cardPicLoader_.code = (Int32.Parse(def.value) == (int)CardPosition.FaceDownDefence) ? 0 : code;
cardPicLoader_.uiTexture = UIHelper.getByName<UITexture>(currentMSwindow, "defPic_");
}
......
Assets/old/Ocgcore/card/Materials/back_pic.mat
View file @ d8d6f2c2
......@@ -7,14 +7,13 @@ Material:
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_Name: back_pic
m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
m_Shader: {fileID: 10752, guid: 0000000000000000f000000000000000, type: 0}
m_ShaderKeywords: _ALPHATEST_ON _SPECULARHIGHLIGHTS_OFF
m_LightmapFlags: 5
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: 2000
stringTagMap:
RenderType: TransparentCutout
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
m_SavedProperties:
serializedVersion: 3
......@@ -69,7 +68,9 @@ Material:
- _DstBlend: 0
- _Emission: 0.5
- _FPOW: 5
- _GlossMapScale: 1
- _Glossiness: 0.5
- _GlossyReflections: 1
- _InvFade: 1
- _Metallic: 0
- _Mode: 1
......@@ -79,6 +80,7 @@ Material:
- _R0: 0.05
- _RimIntensity: 3
- _RimPower: 3
- _SmoothnessTextureChannel: 0
- _SpecularHighlights: 0
- _SrcBlend: 1
- _UVSec: 0
......
Assets/old/Ocgcore/card/Materials/face_pic.mat
View file @ d8d6f2c2
......@@ -7,14 +7,13 @@ Material:
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_Name: face_pic
m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
m_Shader: {fileID: 10752, guid: 0000000000000000f000000000000000, type: 0}
m_ShaderKeywords: _ALPHATEST_ON _SPECULARHIGHLIGHTS_OFF
m_LightmapFlags: 5
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: 2450
stringTagMap:
RenderType: TransparentCutout
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
m_SavedProperties:
serializedVersion: 3
......@@ -95,7 +94,9 @@ Material:
- _DstBlend: 0
- _Exposure: 1
- _Focus: -100
- _GlossMapScale: 1
- _Glossiness: 0.5
- _GlossyReflections: 1
- _InvFade: 1
- _Metallic: 0
- _Mode: 1
......@@ -103,6 +104,7 @@ Material:
- _Parallax: 0.02
- _Rotation: 0
- _Shininess: 0.2
- _SmoothnessTextureChannel: 0
- _SpecularHighlights: 0
- _SrcBlend: 1
- _UVSec: 0
......
Assets/old/Ocgcore/card/Materials/shower_mat.mat
View file @ d8d6f2c2
......@@ -7,12 +7,12 @@ Material:
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_Name: shower_mat
m_Shader: {fileID: 30, guid: 0000000000000000f000000000000000, type: 0}
m_Shader: {fileID: 10750, guid: 0000000000000000f000000000000000, type: 0}
m_ShaderKeywords:
m_LightmapFlags: 5
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: 3000
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
m_SavedProperties:
......@@ -39,7 +39,7 @@ Material:
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MainTex:
m_Texture: {fileID: 2891320, guid: cbd439a6b1dc1ab4284c3161ae0e8dac, type: 2}
m_Texture: {fileID: 2800000, guid: 6a6ef1fd91ae4f04085befdd9869fe20, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MetallicGlossMap:
......
Assets/transUI/prefab/trans_setting.prefab
View file @ d8d6f2c2
......@@ -9691,21 +9691,21 @@ MonoBehaviour:
bottomAnchor:
target: {fileID: 484650}
relative: 0
absolute: -3
absolute: 25
topAnchor:
target: {fileID: 484650}
relative: 1
absolute: 3
absolute: -25
updateAnchors: 1
mColor: {r: 1, g: 1, b: 1, a: 1}
mPivot: 4
mWidth: 744
mHeight: 696
mHeight: 640
mDepth: -100
autoResizeBoxCollider: 0
hideIfOffScreen: 0
keepAspectRatio: 0
aspectRatio: 1.0689656
aspectRatio: 1.122172
mType: 0
mFillDirection: 4
mFillAmount: 1
......
ProjectSettings/ProjectSettings.asset
View file @ d8d6f2c2
......@@ -123,7 +123,7 @@ PlayerSettings:
16:10: 1
16:9: 1
Others: 1
bundleVersion: 2.2.4 (1.034.9)
bundleVersion: 2.2.5 (1.034.9)
preloadedAssets: []
metroInputSource: 0
m_HolographicPauseOnTrackingLoss: 1
......@@ -148,7 +148,7 @@ PlayerSettings:
tvOS: cn.ygopro2.ygopro2android
buildNumber:
iOS:
AndroidBundleVersionCode: 7
AndroidBundleVersionCode: 8
AndroidMinSdkVersion: 16
AndroidTargetSdkVersion: 0
AndroidPreferredInstallLocation: 0
......
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