Commit bdace0de authored by mercury233's avatar mercury233 Committed by Unicorn369

add shuffle deck button when changing side

parent 0cfa9b77
...@@ -297,7 +297,7 @@ Transform: ...@@ -297,7 +297,7 @@ Transform:
m_PrefabInternal: {fileID: 100100000} m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 122638} m_GameObject: {fileID: 122638}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -3495.309, y: -1428.0245, z: 2671.4658} m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: m_Children:
- {fileID: 484892} - {fileID: 484892}
...@@ -305,6 +305,7 @@ Transform: ...@@ -305,6 +305,7 @@ Transform:
- {fileID: 444810} - {fileID: 444810}
- {fileID: 494516} - {fileID: 494516}
- {fileID: 456136} - {fileID: 456136}
- {fileID: 4112803467672144}
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_RootOrder: 0 m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
...@@ -451,7 +452,7 @@ Transform: ...@@ -451,7 +452,7 @@ Transform:
m_PrefabInternal: {fileID: 100100000} m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 112414} m_GameObject: {fileID: 112414}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -232, y: 51, z: 0} m_LocalPosition: {x: -232, y: 42, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: [] m_Children: []
m_Father: {fileID: 456136} m_Father: {fileID: 456136}
...@@ -464,7 +465,7 @@ Transform: ...@@ -464,7 +465,7 @@ Transform:
m_PrefabInternal: {fileID: 100100000} m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 189672} m_GameObject: {fileID: 189672}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -442.5, y: -150, z: 0} m_LocalPosition: {x: -502.5, y: -150, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: m_Children:
- {fileID: 446740} - {fileID: 446740}
...@@ -493,7 +494,7 @@ Transform: ...@@ -493,7 +494,7 @@ Transform:
m_PrefabInternal: {fileID: 100100000} m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 129148} m_GameObject: {fileID: 129148}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -330, y: 5, z: 0} m_LocalPosition: {x: -390, y: 5, z: 0}
m_LocalScale: {x: 0.8, y: 0.8, z: 1} m_LocalScale: {x: 0.8, y: 0.8, z: 1}
m_Children: m_Children:
- {fileID: 421706} - {fileID: 421706}
...@@ -507,7 +508,7 @@ Transform: ...@@ -507,7 +508,7 @@ Transform:
m_PrefabInternal: {fileID: 100100000} m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 109670} m_GameObject: {fileID: 109670}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 30, z: 0} m_LocalPosition: {x: 0, y: 20, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: [] m_Children: []
m_Father: {fileID: 456136} m_Father: {fileID: 456136}
...@@ -520,7 +521,7 @@ Transform: ...@@ -520,7 +521,7 @@ Transform:
m_PrefabInternal: {fileID: 100100000} m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 173956} m_GameObject: {fileID: 173956}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -165, y: 30, z: 0} m_LocalPosition: {x: -225, y: 30, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: m_Children:
- {fileID: 442836} - {fileID: 442836}
...@@ -573,7 +574,7 @@ BoxCollider: ...@@ -573,7 +574,7 @@ BoxCollider:
m_IsTrigger: 1 m_IsTrigger: 1
m_Enabled: 1 m_Enabled: 1
serializedVersion: 2 serializedVersion: 2
m_Size: {x: 480, y: 78, z: 0} m_Size: {x: 480, y: 60, z: 0}
m_Center: {x: 0, y: 0, z: 0} m_Center: {x: 0, y: 0, z: 0}
--- !u!65 &6577030 --- !u!65 &6577030
BoxCollider: BoxCollider:
...@@ -1125,30 +1126,30 @@ MonoBehaviour: ...@@ -1125,30 +1126,30 @@ MonoBehaviour:
rightAnchor: rightAnchor:
target: {fileID: 493044} target: {fileID: 493044}
relative: 1 relative: 1
absolute: -10 absolute: -8
bottomAnchor: bottomAnchor:
target: {fileID: 493044} target: {fileID: 493044}
relative: 0 relative: 0
absolute: 18 absolute: 8
topAnchor: topAnchor:
target: {fileID: 493044} target: {fileID: 493044}
relative: 1 relative: 1
absolute: -18 absolute: -8
updateAnchors: 1 updateAnchors: 1
mColor: {r: 1, g: 1, b: 1, a: 0.40392157} mColor: {r: 1, g: 1, b: 1, a: 0.40392157}
mPivot: 0 mPivot: 0
mWidth: 462 mWidth: 464
mHeight: 42 mHeight: 44
mDepth: 1 mDepth: 1
autoResizeBoxCollider: 0 autoResizeBoxCollider: 0
hideIfOffScreen: 0 hideIfOffScreen: 0
keepAspectRatio: 0 keepAspectRatio: 0
aspectRatio: 11.268292 aspectRatio: 10.545455
keepCrispWhenShrunk: 1 keepCrispWhenShrunk: 1
mTrueTypeFont: {fileID: 12800000, guid: f775853fdfd14bb47934543e95c3bae3, type: 3} mTrueTypeFont: {fileID: 12800000, guid: f775853fdfd14bb47934543e95c3bae3, type: 3}
mFont: {fileID: 0} mFont: {fileID: 0}
mText: Press here to type mText: Press here to type
mFontSize: 35 mFontSize: 30
mFontStyle: 0 mFontStyle: 0
mAlignment: 0 mAlignment: 0
mEncoding: 0 mEncoding: 0
...@@ -1324,12 +1325,12 @@ MonoBehaviour: ...@@ -1324,12 +1325,12 @@ MonoBehaviour:
mColor: {r: 1, g: 1, b: 1, a: 0.39215687} mColor: {r: 1, g: 1, b: 1, a: 0.39215687}
mPivot: 4 mPivot: 4
mWidth: 480 mWidth: 480
mHeight: 78 mHeight: 60
mDepth: 0 mDepth: 0
autoResizeBoxCollider: 0 autoResizeBoxCollider: 0
hideIfOffScreen: 0 hideIfOffScreen: 0
keepAspectRatio: 0 keepAspectRatio: 0
aspectRatio: 6.1538463 aspectRatio: 8
mType: 1 mType: 1
mFillDirection: 4 mFillDirection: 4
mFillAmount: 1 mFillAmount: 1
...@@ -1473,3 +1474,259 @@ Prefab: ...@@ -1473,3 +1474,259 @@ Prefab:
m_ParentPrefab: {fileID: 0} m_ParentPrefab: {fileID: 0}
m_RootGameObject: {fileID: 122638} m_RootGameObject: {fileID: 122638}
m_IsPrefabParent: 1 m_IsPrefabParent: 1
--- !u!1 &1090071909012216
GameObject:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
serializedVersion: 5
m_Component:
- component: {fileID: 4462135326279736}
- component: {fileID: 114529814880556912}
m_Layer: 5
m_Name: UISlicedSprite
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!1 &1206558467532236
GameObject:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
serializedVersion: 5
m_Component:
- component: {fileID: 4294374016992652}
- component: {fileID: 111990062345887232}
m_Layer: 5
m_Name: Animation
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!1 &1922203362664764
GameObject:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
serializedVersion: 5
m_Component:
- component: {fileID: 4112803467672144}
- component: {fileID: 65940854965477484}
- component: {fileID: 114124165728554122}
- component: {fileID: 114280689239848334}
- component: {fileID: 114391265769941638}
- component: {fileID: 114341697453902592}
m_Layer: 5
m_Name: rand_
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &4112803467672144
Transform:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1922203362664764}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -165, y: 30, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 4294374016992652}
m_Father: {fileID: 406978}
m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!4 &4294374016992652
Transform:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1206558467532236}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 4462135326279736}
m_Father: {fileID: 4112803467672144}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!4 &4462135326279736
Transform:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1090071909012216}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 4294374016992652}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!65 &65940854965477484
BoxCollider:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1922203362664764}
m_Material: {fileID: 0}
m_IsTrigger: 1
m_Enabled: 1
serializedVersion: 2
m_Size: {x: 60, y: 60, z: 0}
m_Center: {x: 0, y: 0, z: 0}
--- !u!111 &111990062345887232
Animation:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1206558467532236}
m_Enabled: 0
serializedVersion: 3
m_Animation: {fileID: 7400000, guid: e8c465e83c3e18040884ef096f01647b, type: 2}
m_Animations:
- {fileID: 7400000, guid: e8c465e83c3e18040884ef096f01647b, type: 2}
m_WrapMode: 0
m_PlayAutomatically: 0
m_AnimatePhysics: 0
m_CullingType: 0
--- !u!114 &114124165728554122
MonoBehaviour:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1922203362664764}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 7d44bc69c2ca5f943b845318866dc1bd, type: 3}
m_Name:
m_EditorClassIdentifier:
audioClip: {fileID: 8300000, guid: b5083cfe83bb875479bd797c61594131, type: 3}
trigger: 0
volume: 1
pitch: 1
--- !u!114 &114280689239848334
MonoBehaviour:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1922203362664764}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 3f093ad5830afe44aba6efa8b8a5d5b9, type: 3}
m_Name:
m_EditorClassIdentifier:
target: {fileID: 111990062345887232}
animator: {fileID: 0}
clipName:
trigger: 1
playDirection: 1
resetOnPlay: 0
clearSelection: 0
ifDisabledOnPlay: 0
disableWhenFinished: 0
onFinished: []
eventReceiver: {fileID: 0}
callWhenFinished:
--- !u!114 &114341697453902592
MonoBehaviour:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1922203362664764}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: eadd010867ada31438c4b62e18c724c6, type: 3}
m_Name:
m_EditorClassIdentifier:
str: "\u6253\u4E71"
--- !u!114 &114391265769941638
MonoBehaviour:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1922203362664764}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 1fdca5042b1d12a4890ec1bd4f04290d, type: 3}
m_Name:
m_EditorClassIdentifier:
tweenTarget: {fileID: 0}
hover: {r: 0.88235295, g: 0.78431374, b: 0.5882353, a: 1}
pressed: {r: 0.7176471, g: 0.6392157, b: 0.48235294, a: 1}
disabledColor: {r: 0.5, g: 0.5, b: 0.5, a: 1}
duration: 0.2
dragHighlight: 0
hoverSprite:
pressedSprite:
disabledSprite:
hoverSprite2D: {fileID: 0}
pressedSprite2D: {fileID: 0}
disabledSprite2D: {fileID: 0}
pixelSnap: 0
onClick: []
mTextureOutNormal:
mTextureOutPressed:
--- !u!114 &114529814880556912
MonoBehaviour:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1090071909012216}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: d5c5ca47aa5c01740810b7c66662099f, type: 3}
m_Name:
m_EditorClassIdentifier:
leftAnchor:
target: {fileID: 0}
relative: 0
absolute: 0
rightAnchor:
target: {fileID: 0}
relative: 1
absolute: 0
bottomAnchor:
target: {fileID: 0}
relative: 0
absolute: 0
topAnchor:
target: {fileID: 0}
relative: 1
absolute: 0
updateAnchors: 1
mColor: {r: 1, g: 1, b: 1, a: 0.78431374}
mPivot: 4
mWidth: 45
mHeight: 45
mDepth: 0
autoResizeBoxCollider: 0
hideIfOffScreen: 0
keepAspectRatio: 0
aspectRatio: 1
mType: 0
mFillDirection: 4
mFillAmount: 1
mInvert: 0
mFlip: 0
centerType: 1
leftType: 1
rightType: 1
bottomType: 1
topType: 1
mRect:
serializedVersion: 2
x: 0
y: 0
width: 1
height: 1
mTexture: {fileID: 0}
mMat: {fileID: 0}
mShader: {fileID: 4800000, guid: e75727d9555d9d14ca51d91908c681bc, type: 3}
mBorder: {x: 0, y: 0, z: 0, w: 0}
mFixedAspect: 0
mOutPath: random
...@@ -194,6 +194,7 @@ public class DeckManager : ServantWithCardDescription ...@@ -194,6 +194,7 @@ public class DeckManager : ServantWithCardDescription
UIHelper.setParent(gameObjectSearch, Program.ui_main_2d); UIHelper.setParent(gameObjectSearch, Program.ui_main_2d);
SetBar(Program.I().new_bar_changeSide, 0, 230); SetBar(Program.I().new_bar_changeSide, 0, 230);
UIPopupList_banlist = null; UIPopupList_banlist = null;
UIHelper.registEvent(toolBar, "rand_", rand);
UIHelper.registEvent(toolBar, "sort_", sort); UIHelper.registEvent(toolBar, "sort_", sort);
UIHelper.registEvent(toolBar, "finish_", home); UIHelper.registEvent(toolBar, "finish_", home);
UIHelper.registEvent(toolBar, "input_", onChat); UIHelper.registEvent(toolBar, "input_", onChat);
......
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