Skip to content

M
MDPro2
Commit 7008c8dc authored by 赤子奈落's avatar 赤子奈落
Browse files
Options

fix bugs

parent 20ab69d5
Show whitespace changes
Inline Side-by-side
Showing with 194 additions and 181 deletions
Assets/MD/Scripts/CardOnSelection.cs
View file @ 7008c8dc
......@@ -166,6 +166,7 @@ public class CardOnSelection : MonoBehaviour
{
arrow = ABLoader.LoadAB("effects/other/fxp_arrow_aim_001");
arrow.transform.position = card.gameObject.transform.position;
arrow.transform.GetChild(0).GetComponent<Renderer>().material.renderQueue = 3005;
}
}
else
......
Assets/MD/Scripts/Shortcuts.cs
View file @ 7008c8dc
......@@ -206,10 +206,10 @@ public class Shortcuts : MonoBehaviour
}
Time.timeScale = timescale;
if (message != Program.I().ocgcore.currentMessage)
{
message = Program.I().ocgcore.currentMessage;
Debug.Log(message);
}
//if (message != Program.I().ocgcore.currentMessage)
//{
// message = Program.I().ocgcore.currentMessage;
// Debug.Log(message);
//}
}
}
Assets/MD/main.unity
View file @ 7008c8dc
......@@ -3510,7 +3510,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 18719174}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -464, y: 32, z: 0}
m_LocalPosition: {x: -520, y: 32, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 473089636}
......@@ -7307,7 +7307,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 46116145}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -464, y: -38, z: 0}
m_LocalPosition: {x: -520, y: -38, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 473089636}
......@@ -8666,7 +8666,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 56796427}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalPosition: {x: 0, y: 1, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 1309510406}
......@@ -8716,13 +8716,13 @@ MonoBehaviour:
updateAnchors: 1
mColor: {r: 1, g: 1, b: 1, a: 1}
mPivot: 4
mWidth: 1778
mWidth: 1891
mHeight: 1080
mDepth: 1000
autoResizeBoxCollider: 1
hideIfOffScreen: 0
keepAspectRatio: 0
aspectRatio: 1.6462963
aspectRatio: 1.7509259
--- !u!65 &56796430
BoxCollider:
m_ObjectHideFlags: 0
......@@ -8734,7 +8734,7 @@ BoxCollider:
m_IsTrigger: 1
m_Enabled: 1
serializedVersion: 2
m_Size: {x: 1778, y: 1080, z: 0}
m_Size: {x: 1891, y: 1080, z: 0}
m_Center: {x: 0, y: 0, z: 0}
--- !u!1 &57185253
GameObject:
......@@ -15049,13 +15049,13 @@ MonoBehaviour:
updateAnchors: 1
mColor: {r: 0, g: 0, b: 0, a: 1}
mPivot: 4
mWidth: 1000
mWidth: 1113
mHeight: 62
mDepth: 2007
autoResizeBoxCollider: 0
hideIfOffScreen: 0
keepAspectRatio: 0
aspectRatio: 16.129032
aspectRatio: 17.951612
mType: 2
mFillDirection: 4
mFillAmount: 1
......@@ -16563,7 +16563,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 96884506}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -609, y: -45, z: 0}
m_LocalPosition: {x: -666, y: -45, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 1394725542}
......@@ -19302,13 +19302,13 @@ MonoBehaviour:
updateAnchors: 1
mColor: {r: 0.5, g: 0.5, b: 0.5, a: 1}
mPivot: 4
mWidth: 1778
mWidth: 1891
mHeight: 2
mDepth: 1001
autoResizeBoxCollider: 0
hideIfOffScreen: 0
keepAspectRatio: 0
aspectRatio: 889
aspectRatio: 945.5
mType: 0
mFillDirection: 4
mFillAmount: 1
......@@ -20819,13 +20819,13 @@ MonoBehaviour:
updateAnchors: 1
mColor: {r: 0.3490566, g: 0, b: 0.12898247, a: 0}
mPivot: 4
mWidth: 1778
mWidth: 1891
mHeight: 1080
mDepth: 0
autoResizeBoxCollider: 0
hideIfOffScreen: 0
keepAspectRatio: 0
aspectRatio: 1.6462963
aspectRatio: 1.7509259
mType: 0
mFillDirection: 4
mFillAmount: 1
......@@ -26331,13 +26331,13 @@ MonoBehaviour:
updateAnchors: 1
mColor: {r: 1, g: 1, b: 1, a: 1}
mPivot: 4
mWidth: 1778
mWidth: 1891
mHeight: 1080
mDepth: 1
autoResizeBoxCollider: 1
hideIfOffScreen: 0
keepAspectRatio: 0
aspectRatio: 1.6462963
aspectRatio: 1.7509259
mType: 2
mFillDirection: 4
mFillAmount: 1
......@@ -30579,7 +30579,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 154672195}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -769, y: 475, z: 0}
m_LocalPosition: {x: -826, y: 475, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 155115123}
......@@ -30697,7 +30697,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 154907117}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -824, y: 475, z: 0}
m_LocalPosition: {x: -880, y: 475, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 155115123}
......@@ -31129,7 +31129,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 154683587}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalPosition: {x: 0, y: 1, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 1528730783}
......@@ -32932,13 +32932,13 @@ MonoBehaviour:
updateAnchors: 1
mColor: {r: 0, g: 0, b: 0, a: 0.7490196}
mPivot: 4
mWidth: 1000
mWidth: 1113
mHeight: 62
mDepth: 2006
autoResizeBoxCollider: 0
hideIfOffScreen: 0
keepAspectRatio: 0
aspectRatio: 16.129032
aspectRatio: 17.951612
mType: 0
mFillDirection: 4
mFillAmount: 1
......@@ -33143,7 +33143,7 @@ BoxCollider:
m_IsTrigger: 0
m_Enabled: 1
serializedVersion: 2
m_Size: {x: 1778, y: 1080, z: 0}
m_Size: {x: 1891, y: 1080, z: 0}
m_Center: {x: 0, y: 0, z: 0}
--- !u!65 &156912075
BoxCollider:
......@@ -48985,7 +48985,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 190608813}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -654, y: -175, z: 0}
m_LocalPosition: {x: -710, y: -175, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 2049850901}
......@@ -54019,7 +54019,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 227250122}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: -1, z: 0}
m_LocalPosition: {x: 0, y: -0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 877396273}
......@@ -54036,7 +54036,7 @@ BoxCollider:
m_IsTrigger: 1
m_Enabled: 1
serializedVersion: 2
m_Size: {x: 1778, y: 1080, z: 0}
m_Size: {x: 1891, y: 1080, z: 0}
m_Center: {x: 0, y: 0, z: 0}
--- !u!114 &227250125
MonoBehaviour:
......@@ -54069,13 +54069,13 @@ MonoBehaviour:
updateAnchors: 1
mColor: {r: 0, g: 0, b: 0, a: 0.8}
mPivot: 4
mWidth: 1778
mWidth: 1891
mHeight: 1080
mDepth: 2001
autoResizeBoxCollider: 1
hideIfOffScreen: 0
keepAspectRatio: 0
aspectRatio: 1.6462963
aspectRatio: 1.7509259
mType: 0
mFillDirection: 4
mFillAmount: 1
......@@ -54659,7 +54659,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 233463039}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -639, y: -60, z: 0}
m_LocalPosition: {x: -696, y: -60, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 25092541}
......@@ -55133,7 +55133,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 235088698}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -609, y: 35, z: 0}
m_LocalPosition: {x: -666, y: 35, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 11679675}
......@@ -67588,7 +67588,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 322579940}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -884, y: 537, z: 0}
m_LocalPosition: {x: -940, y: 538, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 826286803}
......@@ -67882,7 +67882,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 324903184}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -480, y: 132, z: 0}
m_LocalPosition: {x: -536, y: 132, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 566365005}
......@@ -67919,13 +67919,13 @@ MonoBehaviour:
updateAnchors: 1
mColor: {r: 1, g: 1, b: 1, a: 1}
mPivot: 0
mWidth: 974
mHeight: 274
mWidth: 1087
mHeight: 275
mDepth: 2020
autoResizeBoxCollider: 0
hideIfOffScreen: 0
keepAspectRatio: 0
aspectRatio: 3.5547445
aspectRatio: 3.9527273
keepCrispWhenShrunk: 1
mTrueTypeFont: {fileID: 12800000, guid: 154a5b3c6e48fa4448be221e7c4a68de, type: 3}
mFont: {fileID: 0}
......@@ -70789,7 +70789,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 344379678}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -434, y: 32, z: 0}
m_LocalPosition: {x: -490, y: 32, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 473089636}
......@@ -71839,7 +71839,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 350768399}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -0, y: 94, z: 0}
m_LocalPosition: {x: -0, y: 95, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 566365005}
......@@ -71876,13 +71876,13 @@ MonoBehaviour:
updateAnchors: 1
mColor: {r: 1, g: 1, b: 1, a: 1}
mPivot: 4
mWidth: 988
mWidth: 1101
mHeight: 6
mDepth: 2010
autoResizeBoxCollider: 0
hideIfOffScreen: 0
keepAspectRatio: 0
aspectRatio: 164.66667
aspectRatio: 183.5
mType: 1
mFillDirection: 4
mFillAmount: 1
......@@ -72460,7 +72460,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 354032795}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -609, y: 355, z: 0}
m_LocalPosition: {x: -666, y: 355, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 688496751}
......@@ -91838,7 +91838,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 484626762}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -284, y: 32, z: 0}
m_LocalPosition: {x: -340, y: 32, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 473089636}
......@@ -94312,13 +94312,13 @@ MonoBehaviour:
updateAnchors: 1
mColor: {r: 0, g: 0, b: 0, a: 0.7490196}
mPivot: 4
mWidth: 1000
mWidth: 1113
mHeight: 137
mDepth: 2006
autoResizeBoxCollider: 0
hideIfOffScreen: 0
keepAspectRatio: 0
aspectRatio: 7.29927
aspectRatio: 8.124087
mType: 0
mFillDirection: 4
mFillAmount: 1
......@@ -97978,7 +97978,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 533439341}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -480, y: 25, z: 0}
m_LocalPosition: {x: -536, y: 25, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 1333285573}
......@@ -98015,13 +98015,13 @@ MonoBehaviour:
updateAnchors: 1
mColor: {r: 1, g: 1, b: 1, a: 1}
mPivot: 0
mWidth: 974
mWidth: 1087
mHeight: 120
mDepth: 2020
autoResizeBoxCollider: 0
hideIfOffScreen: 0
keepAspectRatio: 0
aspectRatio: 8.116667
aspectRatio: 9.058333
keepCrispWhenShrunk: 1
mTrueTypeFont: {fileID: 12800000, guid: f0cfb8fcae3317e4196a7f6e4c50fbd1, type: 3}
mFont: {fileID: 0}
......@@ -101948,7 +101948,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 566365004}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 245, y: -299, z: 0}
m_LocalPosition: {x: 245, y: -298, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 350768400}
......@@ -101991,13 +101991,13 @@ MonoBehaviour:
updateAnchors: 1
mColor: {r: 1, g: 1, b: 1, a: 1}
mPivot: 4
mWidth: 1028
mHeight: 324
mWidth: 1141
mHeight: 325
mDepth: 2005
autoResizeBoxCollider: 0
hideIfOffScreen: 0
keepAspectRatio: 0
aspectRatio: 3.1728394
aspectRatio: 3.5107691
mType: 1
mFillDirection: 4
mFillAmount: 1
......@@ -103421,7 +103421,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 577667971}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -654, y: -435, z: 0}
m_LocalPosition: {x: -710, y: -435, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 185561395}
......@@ -106032,7 +106032,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 591772094}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -434, y: -38, z: 0}
m_LocalPosition: {x: -490, y: -38, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 473089636}
......@@ -107331,7 +107331,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 610538404}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -314, y: 32, z: 0}
m_LocalPosition: {x: -370, y: 32, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 473089636}
......@@ -109242,7 +109242,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 621514906}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 71, y: -575, z: 0}
m_LocalPosition: {x: 15, y: -574, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 724701853}
......@@ -111135,13 +111135,13 @@ MonoBehaviour:
updateAnchors: 1
mColor: {r: 1, g: 1, b: 1, a: 1}
mPivot: 4
mWidth: 988
mWidth: 1101
mHeight: 6
mDepth: 2010
autoResizeBoxCollider: 0
hideIfOffScreen: 0
keepAspectRatio: 0
aspectRatio: 164.66667
aspectRatio: 183.5
mType: 1
mFillDirection: 4
mFillAmount: 1
......@@ -119562,7 +119562,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 700318951}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -654, y: 215, z: 0}
m_LocalPosition: {x: -710, y: 215, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 121490001}
......@@ -123494,7 +123494,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 726561571}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 2478, y: -575, z: 0}
m_LocalPosition: {x: 2478, y: -574, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 726230985}
......@@ -126522,13 +126522,13 @@ MonoBehaviour:
updateAnchors: 1
mColor: {r: 1, g: 1, b: 1, a: 1}
mPivot: 4
mWidth: 878
mWidth: 991
mHeight: 1010
mDepth: 9
autoResizeBoxCollider: 1
hideIfOffScreen: 0
keepAspectRatio: 0
aspectRatio: 0.8693069
aspectRatio: 0.9811881
keepCrispWhenShrunk: 1
mTrueTypeFont: {fileID: 12800000, guid: f0cfb8fcae3317e4196a7f6e4c50fbd1, type: 3}
mFont: {fileID: 0}
......@@ -130514,7 +130514,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 755243878}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -771, y: 475, z: 0}
m_LocalPosition: {x: -827, y: 475, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 1902820823}
......@@ -137150,13 +137150,13 @@ MonoBehaviour:
updateAnchors: 1
mColor: {r: 0, g: 0, b: 0, a: 1}
mPivot: 4
mWidth: 988
mWidth: 1101
mHeight: 49
mDepth: 2009
autoResizeBoxCollider: 0
hideIfOffScreen: 0
keepAspectRatio: 0
aspectRatio: 20.163265
aspectRatio: 22.469387
mType: 0
mFillDirection: 4
mFillAmount: 1
......@@ -140287,7 +140287,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 824535071}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -654, y: 345, z: 0}
m_LocalPosition: {x: -710, y: 345, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 1478486228}
......@@ -147036,7 +147036,7 @@ MonoBehaviour:
mClipTexture: {fileID: 0}
mAlpha: 0
mClipping: 4
mClipRange: {x: 0, y: -0.5267334, z: 1777.8353, w: 1080}
mClipRange: {x: 0, y: -0.4967041, z: 1890.5034, w: 1080}
mClipSoftness: {x: 4, y: 4}
mDepth: 2000
mSortingOrder: 0
......@@ -150450,7 +150450,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 903660189}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -464, y: 32, z: 0}
m_LocalPosition: {x: -520, y: 32, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 1906718174}
......@@ -155670,7 +155670,7 @@ MonoBehaviour:
thumb: {fileID: 0}
mBG: {fileID: 1550533514}
mFG: {fileID: 1198923800}
mValue: 0.4814679
mValue: 0.48147583
mFill: 3
numberOfSteps: 0
onChange: []
......@@ -155678,7 +155678,7 @@ MonoBehaviour:
rawValue: 1
direction: 2
mInverted: 0
mSize: 0.9977778
mSize: 0.99777776
mScroll: 0
mDir: 2
--- !u!4 &943997383
......@@ -158438,7 +158438,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 960826863}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -654, y: -305, z: 0}
m_LocalPosition: {x: -710, y: -305, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 276977678}
......@@ -158896,7 +158896,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 966468259}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -164, y: 32, z: 0}
m_LocalPosition: {x: -220, y: 32, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 473089636}
......@@ -160487,13 +160487,13 @@ MonoBehaviour:
updateAnchors: 1
mColor: {r: 0, g: 0, b: 0, a: 1}
mPivot: 4
mWidth: 988
mWidth: 1101
mHeight: 65
mDepth: 2009
autoResizeBoxCollider: 0
hideIfOffScreen: 0
keepAspectRatio: 0
aspectRatio: 15.2
aspectRatio: 16.938461
mType: 0
mFillDirection: 4
mFillAmount: 1
......@@ -163959,13 +163959,13 @@ MonoBehaviour:
updateAnchors: 1
mColor: {r: 0, g: 0, b: 0, a: 0}
mPivot: 4
mWidth: 1778
mWidth: 1891
mHeight: 1080
mDepth: 1000
autoResizeBoxCollider: 1
hideIfOffScreen: 0
keepAspectRatio: 0
aspectRatio: 1.6462963
aspectRatio: 1.7509259
mType: 0
mFillDirection: 4
mFillAmount: 1
......@@ -166796,7 +166796,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1021043636}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -609, y: 195, z: 0}
m_LocalPosition: {x: -666, y: 195, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 1308678283}
......@@ -169767,7 +169767,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1041169190}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -574, y: 28, z: 0}
m_LocalPosition: {x: -630, y: 29, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 877396273}
......@@ -178320,7 +178320,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1102355770}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -264, y: -38, z: 0}
m_LocalPosition: {x: -320, y: -38, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 473089636}
......@@ -183906,7 +183906,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1147201427}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -684, y: 0, z: 0}
m_LocalPosition: {x: -740, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 1888748362}
......@@ -185543,13 +185543,13 @@ MonoBehaviour:
updateAnchors: 1
mColor: {r: 1, g: 1, b: 1, a: 1}
mPivot: 4
mWidth: 1778
mWidth: 1891
mHeight: 1080
mDepth: 1002
autoResizeBoxCollider: 0
hideIfOffScreen: 0
keepAspectRatio: 0
aspectRatio: 1.6462963
aspectRatio: 1.7509259
mType: 2
mFillDirection: 4
mFillAmount: 1
......@@ -190372,13 +190372,13 @@ MonoBehaviour:
updateAnchors: 1
mColor: {r: 0, g: 0, b: 0, a: 0.7490196}
mPivot: 4
mWidth: 1000
mHeight: 296
mWidth: 1113
mHeight: 297
mDepth: 2006
autoResizeBoxCollider: 0
hideIfOffScreen: 0
keepAspectRatio: 0
aspectRatio: 3.3783784
aspectRatio: 3.7474747
mType: 0
mFillDirection: 4
mFillAmount: 1
......@@ -191858,8 +191858,8 @@ BoxCollider:
m_IsTrigger: 1
m_Enabled: 1
serializedVersion: 2
m_Size: {x: 18, y: 898.0356, z: 0}
m_Center: {x: 0, y: 0.03640747, z: 0}
m_Size: {x: 18, y: 898.0355, z: 0}
m_Center: {x: 0, y: 0.036376953, z: 0}
--- !u!4 &1198923802
Transform:
m_ObjectHideFlags: 0
......@@ -194672,7 +194672,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1223989044}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 116, z: 0}
m_LocalPosition: {x: 0, y: 117, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 566365005}
......@@ -194709,13 +194709,13 @@ MonoBehaviour:
updateAnchors: 1
mColor: {r: 0, g: 0, b: 0, a: 1}
mPivot: 4
mWidth: 988
mWidth: 1101
mHeight: 49
mDepth: 2009
autoResizeBoxCollider: 0
hideIfOffScreen: 0
keepAspectRatio: 0
aspectRatio: 20.163265
aspectRatio: 22.469387
mType: 1
mFillDirection: 4
mFillAmount: 1
......@@ -203483,7 +203483,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1283650613}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -609, y: -205, z: 0}
m_LocalPosition: {x: -666, y: -205, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 1632985606}
......@@ -208253,7 +208253,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1309342653}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -409, y: 239, z: 0}
m_LocalPosition: {x: -465, y: 240, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 877396273}
......@@ -208376,13 +208376,13 @@ MonoBehaviour:
updateAnchors: 1
mColor: {r: 0, g: 0, b: 0, a: 1}
mPivot: 4
mWidth: 1778
mWidth: 1891
mHeight: 1080
mDepth: 1000
autoResizeBoxCollider: 1
hideIfOffScreen: 0
keepAspectRatio: 0
aspectRatio: 1.6462963
aspectRatio: 1.7509259
mType: 0
mFillDirection: 4
mFillAmount: 1
......@@ -208769,7 +208769,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1314142160}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 834, y: -0, z: 0}
m_LocalPosition: {x: 890, y: -0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 116842647}
......@@ -209567,7 +209567,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1317697277}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalPosition: {x: 0, y: 1, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 125221943}
......@@ -209611,13 +209611,13 @@ MonoBehaviour:
updateAnchors: 1
mColor: {r: 1, g: 1, b: 1, a: 0}
mPivot: 4
mWidth: 1778
mWidth: 1891
mHeight: 1080
mDepth: 0
autoResizeBoxCollider: 0
hideIfOffScreen: 0
keepAspectRatio: 0
aspectRatio: 1.6462963
aspectRatio: 1.7509259
--- !u!1 &1318736772
GameObject:
m_ObjectHideFlags: 0
......@@ -210382,7 +210382,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1321215901}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -609, y: 115, z: 0}
m_LocalPosition: {x: -666, y: 115, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 1408910088}
......@@ -212086,7 +212086,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1333285572}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 245, y: -2, z: 0}
m_LocalPosition: {x: 245, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 2066292003}
......@@ -212129,13 +212129,13 @@ MonoBehaviour:
updateAnchors: 1
mColor: {r: 1, g: 1, b: 1, a: 1}
mPivot: 4
mWidth: 1028
mWidth: 1141
mHeight: 230
mDepth: 2005
autoResizeBoxCollider: 0
hideIfOffScreen: 0
keepAspectRatio: 0
aspectRatio: 4.4695654
aspectRatio: 4.96087
mType: 1
mFillDirection: 4
mFillAmount: 1
......@@ -215683,7 +215683,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1356031699}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -234, y: -38, z: 0}
m_LocalPosition: {x: -290, y: -38, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 473089636}
......@@ -216923,7 +216923,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1366598849}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 245, y: 364, z: 0}
m_LocalPosition: {x: 245, y: 365, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 1562055027}
......@@ -216965,13 +216965,13 @@ MonoBehaviour:
updateAnchors: 1
mColor: {r: 1, g: 1, b: 1, a: 1}
mPivot: 4
mWidth: 1028
mWidth: 1141
mHeight: 90
mDepth: 2005
autoResizeBoxCollider: 0
hideIfOffScreen: 0
keepAspectRatio: 0
aspectRatio: 11.422222
aspectRatio: 12.677778
mType: 1
mFillDirection: 4
mFillAmount: 1
......@@ -218815,7 +218815,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1376539214}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -609, y: 275, z: 0}
m_LocalPosition: {x: -666, y: 275, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 1394361505}
......@@ -231706,7 +231706,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1471391069}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -826, y: 475, z: 0}
m_LocalPosition: {x: -882, y: 475, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 56796428}
......@@ -236190,13 +236190,13 @@ MonoBehaviour:
updateAnchors: 1
mColor: {r: 0, g: 0, b: 0, a: 0.7490196}
mPivot: 4
mWidth: 1000
mWidth: 1113
mHeight: 202
mDepth: 2006
autoResizeBoxCollider: 0
hideIfOffScreen: 0
keepAspectRatio: 0
aspectRatio: 4.9504952
aspectRatio: 5.509901
mType: 0
mFillDirection: 4
mFillAmount: 1
......@@ -236695,7 +236695,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1497909054}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -829, y: 396, z: 0}
m_LocalPosition: {x: -885, y: 398, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 877396273}
......@@ -240669,13 +240669,13 @@ MonoBehaviour:
updateAnchors: 2
mColor: {r: 1, g: 1, b: 1, a: 0.9019608}
mPivot: 4
mWidth: 1778
mWidth: 1891
mHeight: 1080
mDepth: 0
autoResizeBoxCollider: 0
hideIfOffScreen: 0
keepAspectRatio: 0
aspectRatio: 1.6462963
aspectRatio: 1.7509259
mType: 0
mFillDirection: 4
mFillAmount: 1
......@@ -240904,7 +240904,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1531937217}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -609, y: -125, z: 0}
m_LocalPosition: {x: -666, y: -125, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 905654878}
......@@ -245907,13 +245907,13 @@ MonoBehaviour:
updateAnchors: 1
mColor: {r: 1, g: 1, b: 1, a: 1}
mPivot: 4
mWidth: 988
mWidth: 1101
mHeight: 50
mDepth: 2010
autoResizeBoxCollider: 0
hideIfOffScreen: 0
keepAspectRatio: 0
aspectRatio: 19.76
aspectRatio: 22.02
mType: 1
mFillDirection: 4
mFillAmount: 1
......@@ -246054,7 +246054,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1563396711}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -769, y: 475, z: 0}
m_LocalPosition: {x: -826, y: 475, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 1317697278}
......@@ -246973,7 +246973,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1568947962}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -654, y: 85, z: 0}
m_LocalPosition: {x: -710, y: 85, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 1305600504}
......@@ -252727,7 +252727,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1614746329}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -824, y: 475, z: 0}
m_LocalPosition: {x: -880, y: 475, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 1317697278}
......@@ -254879,7 +254879,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1632171226}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -480, y: 85, z: 0}
m_LocalPosition: {x: -536, y: 85, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 1333285573}
......@@ -254916,13 +254916,13 @@ MonoBehaviour:
updateAnchors: 1
mColor: {r: 1, g: 1, b: 1, a: 1}
mPivot: 0
mWidth: 974
mWidth: 1087
mHeight: 180
mDepth: 2020
autoResizeBoxCollider: 0
hideIfOffScreen: 0
keepAspectRatio: 0
aspectRatio: 5.411111
aspectRatio: 6.038889
keepCrispWhenShrunk: 1
mTrueTypeFont: {fileID: 12800000, guid: 154a5b3c6e48fa4448be221e7c4a68de, type: 3}
mFont: {fileID: 0}
......@@ -255161,7 +255161,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1633343722}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -771, y: 475, z: 0}
m_LocalPosition: {x: -827, y: 475, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 56796428}
......@@ -256863,7 +256863,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1646535182}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -480, y: 72, z: 0}
m_LocalPosition: {x: -536, y: 72, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 566365005}
......@@ -256900,13 +256900,13 @@ MonoBehaviour:
updateAnchors: 1
mColor: {r: 1, g: 1, b: 1, a: 1}
mPivot: 0
mWidth: 974
mHeight: 214
mWidth: 1087
mHeight: 215
mDepth: 2020
autoResizeBoxCollider: 0
hideIfOffScreen: 0
keepAspectRatio: 0
aspectRatio: 4.551402
aspectRatio: 5.055814
keepCrispWhenShrunk: 1
mTrueTypeFont: {fileID: 12800000, guid: f0cfb8fcae3317e4196a7f6e4c50fbd1, type: 3}
mFont: {fileID: 0}
......@@ -258036,7 +258036,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1651446160}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -609, y: -285, z: 0}
m_LocalPosition: {x: -666, y: -285, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 674466458}
......@@ -260348,7 +260348,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1661358137}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 825, y: 470, z: 0}
m_LocalPosition: {x: 881, y: 471, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 877396273}
......@@ -270281,13 +270281,13 @@ MonoBehaviour:
updateAnchors: 1
mColor: {r: 0.5, g: 0.5, b: 0.5, a: 1}
mPivot: 4
mWidth: 1000
mHeight: 296
mWidth: 1113
mHeight: 297
mDepth: 2007
autoResizeBoxCollider: 0
hideIfOffScreen: 0
keepAspectRatio: 0
aspectRatio: 3.3783784
aspectRatio: 3.7474747
mType: 2
mFillDirection: 4
mFillAmount: 1
......@@ -273810,7 +273810,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1752056656}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 465, y: 0, z: 0}
m_LocalPosition: {x: 522, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 1366598850}
......@@ -288501,13 +288501,13 @@ MonoBehaviour:
updateAnchors: 1
mColor: {r: 1, g: 1, b: 1, a: 1}
mPivot: 4
mWidth: 974
mWidth: 1087
mHeight: 50
mDepth: 2020
autoResizeBoxCollider: 0
hideIfOffScreen: 0
keepAspectRatio: 0
aspectRatio: 19.48
aspectRatio: 21.74
keepCrispWhenShrunk: 1
mTrueTypeFont: {fileID: 12800000, guid: d086cc69053abce42a6351765ad88863, type: 3}
mFont: {fileID: 0}
......@@ -294276,7 +294276,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1886772448}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -654, y: -45, z: 0}
m_LocalPosition: {x: -710, y: -45, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 279578385}
......@@ -296406,7 +296406,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1902820822}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalPosition: {x: 0, y: 1, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 993754079}
......@@ -296454,13 +296454,13 @@ MonoBehaviour:
updateAnchors: 1
mColor: {r: 1, g: 1, b: 1, a: 1}
mPivot: 4
mWidth: 1778
mWidth: 1891
mHeight: 1080
mDepth: 0
autoResizeBoxCollider: 1
hideIfOffScreen: 0
keepAspectRatio: 0
aspectRatio: 1.6462963
aspectRatio: 1.7509259
--- !u!65 &1902820825
BoxCollider:
m_ObjectHideFlags: 0
......@@ -296472,7 +296472,7 @@ BoxCollider:
m_IsTrigger: 1
m_Enabled: 1
serializedVersion: 2
m_Size: {x: 1778, y: 1080, z: 0}
m_Size: {x: 1891, y: 1080, z: 0}
m_Center: {x: 0, y: 0, z: 0}
--- !u!1 &1904610517
GameObject:
......@@ -296867,7 +296867,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1906718173}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 245, y: 216, z: 0}
m_LocalPosition: {x: 245, y: 218, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 633048091}
......@@ -296911,13 +296911,13 @@ MonoBehaviour:
updateAnchors: 1
mColor: {r: 1, g: 1, b: 1, a: 1}
mPivot: 4
mWidth: 1028
mWidth: 1141
mHeight: 165
mDepth: 2005
autoResizeBoxCollider: 0
hideIfOffScreen: 0
keepAspectRatio: 0
aspectRatio: 6.230303
aspectRatio: 6.9151516
mType: 1
mFillDirection: 4
mFillAmount: 1
......@@ -299525,7 +299525,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1928237383}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -826, y: 475, z: 0}
m_LocalPosition: {x: -882, y: 475, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 1902820823}
......@@ -309518,7 +309518,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1995733149}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -439, y: 29, z: 0}
m_LocalPosition: {x: -495, y: 29, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 1906718174}
......@@ -319413,13 +319413,13 @@ MonoBehaviour:
updateAnchors: 1
mColor: {r: 1, g: 1, b: 1, a: 1}
mPivot: 4
mWidth: 988
mWidth: 1101
mHeight: 6
mDepth: 2010
autoResizeBoxCollider: 0
hideIfOffScreen: 0
keepAspectRatio: 0
aspectRatio: 164.66667
aspectRatio: 183.5
mType: 1
mFillDirection: 4
mFillAmount: 1
......@@ -324209,13 +324209,13 @@ MonoBehaviour:
updateAnchors: 1
mColor: {r: 0.5, g: 0.5, b: 0.5, a: 1}
mPivot: 4
mWidth: 1000
mWidth: 1113
mHeight: 202
mDepth: 2007
autoResizeBoxCollider: 0
hideIfOffScreen: 0
keepAspectRatio: 0
aspectRatio: 4.9504952
aspectRatio: 5.509901
mType: 2
mFillDirection: 4
mFillAmount: 1
......@@ -325381,13 +325381,13 @@ MonoBehaviour:
updateAnchors: 1
mColor: {r: 0, g: 0, b: 0, a: 1}
mPivot: 4
mWidth: 1000
mWidth: 1113
mHeight: 137
mDepth: 2007
autoResizeBoxCollider: 0
hideIfOffScreen: 0
keepAspectRatio: 0
aspectRatio: 7.29927
aspectRatio: 8.124087
mType: 2
mFillDirection: 4
mFillAmount: 1
......@@ -335921,7 +335921,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4102257414962066928}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 121, y: -75, z: 0}
m_LocalPosition: {x: 65, y: -74, z: 0}
m_LocalScale: {x: 0.87, y: 0.87, z: 0.87}
m_Children: []
m_Father: {fileID: 4102257415107416394}
......@@ -336595,7 +336595,7 @@ MonoBehaviour:
mClipTexture: {fileID: 0}
mAlpha: 1
mClipping: 3
mClipRange: {x: 960, y: -539.52673, z: 1777.8354, w: 1080}
mClipRange: {x: 960, y: -539.4967, z: 1890.5034, w: 1080}
mClipSoftness: {x: 0, y: 0}
mDepth: 0
mSortingOrder: 0
......@@ -337273,7 +337273,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4102257415107642646}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 71, y: -375, z: 0}
m_LocalPosition: {x: 15, y: -374, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 4102257415107450992}
......@@ -337292,7 +337292,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4102257415107685576}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 71, y: -775, z: 0}
m_LocalPosition: {x: 15, y: -774, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 4102257415107484686}
......@@ -337325,7 +337325,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4102257415107888902}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 391, y: -75, z: 0}
m_LocalPosition: {x: 335, y: -74, z: 0}
m_LocalScale: {x: 0.87, y: 0.87, z: 0.87}
m_Children: []
m_Father: {fileID: 4102257415107416394}
......@@ -337377,7 +337377,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4102257415107883268}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 71, y: -475, z: 0}
m_LocalPosition: {x: 15, y: -474, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 4102257415107420704}
......@@ -337396,7 +337396,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4102257415107887070}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 71, y: -175, z: 0}
m_LocalPosition: {x: 15, y: -174, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 4102257415107482378}
......@@ -337429,7 +337429,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4102257415107873672}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 71, y: -875, z: 0}
m_LocalPosition: {x: 15, y: -874, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 4102257415107474430}
......@@ -337448,7 +337448,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4102257415107881278}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 71, y: -675, z: 0}
m_LocalPosition: {x: 15, y: -674, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 4102257415107408084}
......@@ -337495,7 +337495,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4102257415107684868}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 71, y: -275, z: 0}
m_LocalPosition: {x: 15, y: -274, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 4102257415107469124}
Assets/SibylSystem/Menu/Menu.cs
View file @ 7008c8dc
......@@ -30,7 +30,7 @@ public class Menu : WindowServantSP
UIHelper.registEvent(gameObject, "exit_", onClickExit);
UIHelper.registEvent(gameObject, "animation_", onClickAnimation);
//MDPRO2 update
UIHelper.getByName<UILabel>(gameObject, "version_").text = "2.0.3";
UIHelper.getByName<UILabel>(gameObject, "version_").text = "2.0.4";
Program.I().StartCoroutine(checkUpdate());
}
......
Assets/SibylSystem/Ocgcore/OCGobjects/gameCard.cs
View file @ 7008c8dc
......@@ -609,8 +609,9 @@ public class gameCard : OCGobject
return re;
}
public void ES_lock(float time)
public void ES_lock(float time, bool exitExcited = true)
{
if(exitExcited)
ES_exit_excited(false);
Object.Destroy(gameObject.AddComponent<card_locker>(), time);
}
......@@ -664,9 +665,10 @@ public class gameCard : OCGobject
if (ES_excited_unsafe_should_not_be_changed_dont_touch_this)
{
ES_excited_handler_close_up_handler();
if(Program.InputGetMouseButtonUp_0 && !clicked)
if (Program.InputGetMouseButtonUp_0 && !clicked && (p.location & (uint)CardLocation.Hand) > 0)
ES_enter_clicked();
else if(Program.InputGetMouseButtonUp_0 && (p.location & (uint)CardLocation.Hand) == 0)
ES_enter_clicked();
//ES_excited_handler_event_cookie_card_bed();
}
}
......@@ -841,6 +843,7 @@ public class gameCard : OCGobject
var iTweens = gameObject.GetComponents<iTween>();
for (var i = 0; i < iTweens.Length; i++) Object.DestroyImmediate(iTweens[i]);
flash_line_off();
Debug.Log("Exit Excited");
ES_excited_unsafe_should_not_be_changed_dont_touch_this = false;
for (var i = 0; i < buttons.Count; i++) buttons[i].hide();
destroy(gameObject_event_card_bed);
......@@ -1222,7 +1225,7 @@ public class gameCard : OCGobject
Program.I().ocgcore.Sleep((int)((time_delay_landing + time_landing - time_lead) * 60));
else
Program.I().ocgcore.Sleep(10);
ES_lock(time_delay_landing + time_landing - time_lead);
ES_lock(time_delay_landing + time_landing - time_lead, false);
if (summonAnimation)
{
......
Assets/SibylSystem/Ocgcore/Ocgcore.cs
View file @ 7008c8dc
......@@ -3668,10 +3668,10 @@ public class Ocgcore : ServantWithCardDescription
card.selectPtr = i;
card.forSelect = true;
//card.add_one_decoration(Program.I().mod_ocgcore_decoration_card_selecting, 4, Vector3.zero, "card_selecting");
if ((card.p.position & (uint)CardPosition.Defence) > 0)
decoration.transform.GetChild(0).transform.localEulerAngles = new Vector3(0, 90, 0);
else
if ((card.p.position & (uint)CardPosition.Attack) > 0)
decoration.transform.GetChild(0).transform.localEulerAngles = new Vector3(0, 0, 0);
else
decoration.transform.GetChild(0).transform.localEulerAngles = new Vector3(0, 90, 0);
card.add_one_decoration(decoration, 4, Vector3.zero, "card_selecting");
card.isShowed = true;
card.currentFlash = gameCard.flashType.Select;
......@@ -5081,6 +5081,7 @@ public class Ocgcore : ServantWithCardDescription
VoiceHandler.PlayFixedLine((uint)player, "PayCost");
break;
case GameMessage.Damage:
Debug.Log("Message: Damage");
gameInfo.realize();
player = localPlayer(r.ReadByte());
val = r.ReadInt32();
......@@ -5268,6 +5269,7 @@ public class Ocgcore : ServantWithCardDescription
break;
case GameMessage.Battle:
AnimationControl ac = GameObject.Find("new_gameField(Clone)/Assets_Loader").GetComponent<AnimationControl>();
Debug.Log("Message: Battle");
if (Program.I().setting.setting.Vbattle.value)
{
removeAttackHandler();
......@@ -5320,9 +5322,9 @@ public class Ocgcore : ServantWithCardDescription
{
var attacker_bool_me = gpsAttacker.controller == 0;
if (attacker_bool_me)
VectorAttackTarget = new Vector3(0, 5, 25);//mark 玩家被攻击位置
VectorAttackTarget = new Vector3(0, 15, 25);//mark 玩家被攻击位置
else
VectorAttackTarget = new Vector3(0, 5, -25);
VectorAttackTarget = new Vector3(0, 15, -25);
}
else
{
......@@ -5463,14 +5465,14 @@ public class Ocgcore : ServantWithCardDescription
GameObject dummy = new GameObject();
if(attackCard.p.controller == 0)
{
dummy.transform.position = new Vector3(0f, 0f, 25f);
dummy.transform.position = new Vector3(0f, 15f, 25f);
hit = "effects/hit/fxp_dithit_far_001";
sound2 = "SE_DUEL/SE_DIRECT_ATTACK_PLAYER";
directAttack = 1;
}
else
{
dummy.transform.position = new Vector3(0f, 0f, -25f);
dummy.transform.position = new Vector3(0f, 15f, -25f);
hit = "effects/hit/fxp_dithit_near_001";
sound2 = "SE_DUEL/SE_DIRECT_ATTACK_RIVAL";
directAttack= 2;
......@@ -5514,7 +5516,9 @@ public class Ocgcore : ServantWithCardDescription
CloseUpControl cc = attackCard.gameObject.transform.Find("mod_simple_quad(Clone)").GetChild(0).GetComponent<CloseUpControl>();
cc.FadeOutIn(0f, 0.3f, 0.5f, 0.2f);
}
if (attackedCard.gameObject.transform.Find("mod_simple_quad(Clone)") != null)
if (attackedCard != null
&&
attackedCard.gameObject.transform.Find("mod_simple_quad(Clone)") != null)
{
CloseUpControl cc = attackedCard.gameObject.transform.Find("mod_simple_quad(Clone)").GetChild(0).GetComponent<CloseUpControl>();
cc.FadeOutIn(0.3f, 0.1f, 1f, 0.2f);
......@@ -5548,7 +5552,9 @@ public class Ocgcore : ServantWithCardDescription
CloseUpControl cc = attackCard.gameObject.transform.Find("mod_simple_quad(Clone)").GetChild(0).GetComponent<CloseUpControl>();
cc.FadeOutIn(0f, 0.5f, 0.55f, 0.2f);
}
if (attackedCard.gameObject.transform.Find("mod_simple_quad(Clone)") != null)
if (attackedCard != null
&&
attackedCard.gameObject.transform.Find("mod_simple_quad(Clone)") != null)
{
CloseUpControl cc = attackedCard.gameObject.transform.Find("mod_simple_quad(Clone)").GetChild(0).GetComponent<CloseUpControl>();
cc.FadeOutIn(0.5f, 0.1f, 1f, 0.2f);
......@@ -6104,10 +6110,10 @@ public class Ocgcore : ServantWithCardDescription
if ((cardsSelectable[i].p.location & (uint)CardLocation.Onfield) > 0 && (cardsSelectable[i].p.location & (uint)CardLocation.Overlay) == 0)
{
//cardsSelectable[i].add_one_decoration(Program.I().mod_ocgcore_decoration_card_selecting, 4, Vector3.zero, "card_selecting");
if ((cardsSelectable[i].p.position & (uint)CardPosition.Defence) > 0)
decoration.transform.GetChild(0).transform.localEulerAngles = new Vector3(0, 90, 0);
else
if ((cardsSelectable[i].p.position & (uint)CardPosition.Attack) > 0)
decoration.transform.GetChild(0).transform.localEulerAngles = new Vector3(0, 0, 0);
else
decoration.transform.GetChild(0).transform.localEulerAngles = new Vector3(0, 90, 0);
cardsSelectable[i].add_one_decoration(decoration, 4, Vector3.zero, "card_selecting");
}
cardsSelectable[i].currentFlash = gameCard.flashType.Select;
......
Assets/newOcgcores/placeSelector.cs
View file @ 7008c8dc
......@@ -21,7 +21,10 @@ public class placeSelector : MonoBehaviour {
selectableGO = ABLoader.LoadAB("effects/hitghlight/fxp_hl_select/fxp_hl_select_trpmgc_001");
}
else if (transform.position.z == -10 || transform.position.z == 10)//场地
selectableGO = ABLoader.LoadAB("effects/hitghlight/fxp_hl_select/fxp_hl_select_trpmgc_001");
{
selectableGO = ABLoader.LoadAB("effects/hitghlight/fxp_hl_select/fxp_hl_select_card_001");
selectableGO.transform.localScale = new Vector3(0.8f, 0.8f, 0.8f);
}
else//额外怪兽区
selectableGO = ABLoader.LoadAB("effects/hitghlight/fxp_hl_select/fxp_hl_select_mst_001");
var main = selectableGO.GetComponent<ParticleSystem>().main;
......
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