Skip to content

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

fix

parent 6f973441
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 1154 additions and 1154 deletions
Assets/ArtSystem/gameInfo/gameInfo.cs
View file @ 36bb6653
......@@ -111,32 +111,32 @@ public class gameInfo : MonoBehaviour
me.transform.localScale = ks;
if (!swaped)
{
opponent.transform.localPosition = new Vector3(Screen.width / 2-14, Screen.height / 2 - 14);
opponent.transform.localPosition = new Vector3(Screen.width / 2 - 14, Screen.height / 2 - 14);
me.transform.localPosition = new Vector3(Screen.width / 2 - 14, Screen.height / 2 - 14 - k * (float)(opponent.under.height));
}
else
{
me.transform.localPosition = new Vector3(Screen.width / 2 - 14, Screen.height / 2 - 14);
opponent.transform.localPosition = new Vector3(Screen.width / 2-14, Screen.height / 2 - 14 - k * (float)(opponent.under.height));
opponent.transform.localPosition = new Vector3(Screen.width / 2 - 14, Screen.height / 2 - 14 - k * (float)(opponent.under.height));
}
float height = 198 + 50 * (HashedButtons.Count);
float height = 198 + 75 * (HashedButtons.Count);
if (HashedButtons.Count == 0)
{
height = 174;
}
width = (150 * kb) + 15f;
float localPositionPanX = (((float)Screen.width - 150 * kb) / 2) - 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_lab.transform.localPosition = new Vector3(Screen.width/ 2 - 315, -Screen.height / 2 + 90, 0);
for (int i = 0; i < HashedButtons.Count; i++)
{
if (HashedButtons[i].gameObject != null)
{
HashedButtons[i].gameObject.transform.localPosition += (new Vector3(0, height / 2 - 142 - i * 50, 0) - HashedButtons[i].gameObject.transform.localPosition) * Program.deltaTime * 10f;
HashedButtons[i].gameObject.transform.localPosition += (new Vector3(0, height / 2 - 220 - i * 75, 0) - HashedButtons[i].gameObject.transform.localPosition) * Program.deltaTime * 10f;
}
}
if (Program.TimePassed() - lastTickTime > 1000)
......@@ -285,7 +285,7 @@ public class gameInfo : MonoBehaviour
}
public void setTimeStill(int player)
public void setTimeStill(int player)
{
time[0] = Program.I().ocgcore.timeLimit;
time[1] = Program.I().ocgcore.timeLimit;
......
Assets/ArtSystem/gameInfo/new_gameInfoRemaster.prefab
View file @ 36bb6653
......@@ -519,8 +519,8 @@ BoxCollider:
m_IsTrigger: 1
m_Enabled: 1
serializedVersion: 2
m_Size: {x: 270, y: 48, z: 0}
m_Center: {x: 135, y: 0, z: 0}
m_Size: {x: 240, y: 48, z: 0}
m_Center: {x: 120, y: 0, z: 0}
--- !u!65 &6532536
BoxCollider:
m_ObjectHideFlags: 1
......@@ -531,7 +531,7 @@ BoxCollider:
m_IsTrigger: 1
m_Enabled: 1
serializedVersion: 2
m_Size: {x: 450, y: 450, z: 0}
m_Size: {x: 300, y: 450, z: 0}
m_Center: {x: 0, y: 0, z: 0}
--- !u!65 &6567354
BoxCollider:
......@@ -543,8 +543,8 @@ BoxCollider:
m_IsTrigger: 1
m_Enabled: 1
serializedVersion: 2
m_Size: {x: 270, y: 45, z: 0}
m_Center: {x: 135, y: 0, z: 0}
m_Size: {x: 240, y: 44, z: 0}
m_Center: {x: 120, 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: 270, y: 48, z: 0}
m_Center: {x: 135, y: 0, z: 0}
m_Size: {x: 240, y: 48, z: 0}
m_Center: {x: 120, y: 0, z: 0}
--- !u!111 &11101560
Animation:
m_ObjectHideFlags: 1
......@@ -676,7 +676,7 @@ MonoBehaviour:
rightAnchor:
target: {fileID: 498562}
relative: 1
absolute: 65
absolute: 35
bottomAnchor:
target: {fileID: 498562}
relative: 1
......@@ -684,17 +684,17 @@ MonoBehaviour:
topAnchor:
target: {fileID: 498562}
relative: 1
absolute: -65
absolute: -66
updateAnchors: 1
mColor: {r: 1, g: 1, b: 1, a: 1}
mPivot: 3
mWidth: 270
mHeight: 45
mWidth: 240
mHeight: 44
mDepth: 6
autoResizeBoxCollider: 1
hideIfOffScreen: 0
keepAspectRatio: 0
aspectRatio: 6
aspectRatio: 5.4545455
--- !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: 210
mHeight: 47
mWidth: 180
mHeight: 46
mDepth: 9
autoResizeBoxCollider: 0
hideIfOffScreen: 0
keepAspectRatio: 0
aspectRatio: 4.4680853
aspectRatio: 3.9130435
keepCrispWhenShrunk: 1
mTrueTypeFont: {fileID: 12800000, guid: f775853fdfd14bb47934543e95c3bae3, type: 3}
mFont: {fileID: 0}
......@@ -999,7 +999,7 @@ MonoBehaviour:
rightAnchor:
target: {fileID: 498562}
relative: 1
absolute: 65
absolute: 35
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: 270
mWidth: 240
mHeight: 48
mDepth: 6
autoResizeBoxCollider: 1
hideIfOffScreen: 0
keepAspectRatio: 0
aspectRatio: 5.625
aspectRatio: 5
--- !u!114 &11430404
MonoBehaviour:
m_ObjectHideFlags: 1
......@@ -1077,20 +1077,20 @@ MonoBehaviour:
updateAnchors: 1
mColor: {r: 1, g: 1, b: 1, a: 1}
mPivot: 4
mWidth: 450
mWidth: 300
mHeight: 450
mDepth: 0
autoResizeBoxCollider: 1
hideIfOffScreen: 0
keepAspectRatio: 0
aspectRatio: 1
aspectRatio: 0.6666667
keepCrispWhenShrunk: 1
mTrueTypeFont: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
mFont: {fileID: 0}
mText:
mFontSize: 30
mFontSize: 25
mFontStyle: 0
mAlignment: 1
mAlignment: 3
mEncoding: 1
mMaxLineCount: 0
mEffectStyle: 2
......@@ -1218,11 +1218,11 @@ MonoBehaviour:
leftAnchor:
target: {fileID: 498562}
relative: 0
absolute: -37
absolute: -12
rightAnchor:
target: {fileID: 498562}
relative: 1
absolute: 37
absolute: 12
bottomAnchor:
target: {fileID: 498562}
relative: 1
......@@ -1234,13 +1234,13 @@ MonoBehaviour:
updateAnchors: 1
mColor: {r: 1, g: 1, b: 1, a: 1}
mPivot: 4
mWidth: 290
mWidth: 240
mHeight: 20
mDepth: 0
autoResizeBoxCollider: 0
hideIfOffScreen: 0
keepAspectRatio: 0
aspectRatio: 14.5
aspectRatio: 12
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: 210
mWidth: 180
mHeight: 50
mDepth: 9
autoResizeBoxCollider: 0
hideIfOffScreen: 0
keepAspectRatio: 0
aspectRatio: 4.2
aspectRatio: 3.6
keepCrispWhenShrunk: 1
mTrueTypeFont: {fileID: 12800000, guid: f775853fdfd14bb47934543e95c3bae3, type: 3}
mFont: {fileID: 0}
......@@ -1892,13 +1892,13 @@ MonoBehaviour:
updateAnchors: 1
mColor: {r: 1, g: 1, b: 1, a: 1}
mPivot: 3
mWidth: 210
mWidth: 180
mHeight: 50
mDepth: 9
autoResizeBoxCollider: 0
hideIfOffScreen: 0
keepAspectRatio: 0
aspectRatio: 4.2
aspectRatio: 3.6
keepCrispWhenShrunk: 1
mTrueTypeFont: {fileID: 12800000, guid: f775853fdfd14bb47934543e95c3bae3, type: 3}
mFont: {fileID: 0}
......@@ -1988,7 +1988,7 @@ MonoBehaviour:
rightAnchor:
target: {fileID: 498562}
relative: 1
absolute: 65
absolute: 35
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: 270
mWidth: 240
mHeight: 48
mDepth: 6
autoResizeBoxCollider: 1
hideIfOffScreen: 0
keepAspectRatio: 0
aspectRatio: 5.625
aspectRatio: 5
--- !u!114 &11495680
MonoBehaviour:
m_ObjectHideFlags: 1
......
Assets/ArtSystem/superButton/new_superButtonTransparent.prefab
View file @ 36bb6653
......@@ -90,7 +90,7 @@ Transform:
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 153646}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: -75, z: 0}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 464504}
......@@ -136,7 +136,7 @@ BoxCollider:
m_Enabled: 1
serializedVersion: 2
m_Size: {x: 195, y: 52, z: 0}
m_Center: {x: 0, y: -75, z: 0}
m_Center: {x: 0, y: 0, z: 0}
--- !u!111 &11143220
Animation:
m_ObjectHideFlags: 1
......
Assets/transUI/prefab/trans_roomTag.prefab
View file @ 36bb6653
This diff is collapsed.
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