Merge branch 'mcpro-unity' of github.com:purerosefallen/ygopro2 into mcpro-unity

Assets/SibylSystem/MyCard/MyCard.cs

@@ -20,12 +20,12 @@ public class MyCard : WindowServantSP
     {
         createWindow(Program.I().new_ui_mycard);
         UIHelper.registEvent(gameObject, "exit_", onClickExit);
-        UIHelper.registEvent(gameObject, "joinAthletic", onJoinAthletic);
-        UIHelper.registEvent(gameObject, "joinEntertain", onJoinEntertain);
-        UIHelper.registEvent(gameObject, "database", onClickDatabase);
-        UIHelper.registEvent(gameObject, "community", onClickCommunity);
-        inputUsername = UIHelper.getByName<UIInput>(gameObject, "nameLine");
-        inputPsw = UIHelper.getByName<UIInput>(gameObject, "pswLine");
+        UIHelper.registEvent(gameObject, "joinAthletic_", onJoinAthletic);
+        UIHelper.registEvent(gameObject, "joinEntertain_", onJoinEntertain);
+        UIHelper.registEvent(gameObject, "database_", onClickDatabase);
+        UIHelper.registEvent(gameObject, "community_", onClickCommunity);
+        inputUsername = UIHelper.getByName<UIInput>(gameObject, "name_");
+        inputPsw = UIHelper.getByName<UIInput>(gameObject, "psw_");
         helper = new MyCardHelper();
         loadUser();
         SetActiveFalse();

Assets/transUI/prefab/trans_myCardLogin.prefab

@@ -61,7 +61,7 @@ GameObject:
   - component: {fileID: 111230526307789670}
   - component: {fileID: 114313769570919500}
   m_Layer: 18
-  m_Name: join_
+  m_Name: community_
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -180,7 +180,7 @@ GameObject:
   - component: {fileID: 111046841262845354}
   - component: {fileID: 114794816589274698}
   m_Layer: 18
-  m_Name: join_
+  m_Name: database_
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -373,7 +373,7 @@ GameObject:
   - component: {fileID: 111220620961711622}
   - component: {fileID: 114415632317491532}
   m_Layer: 18
-  m_Name: join_
+  m_Name: joinEntertain_
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -489,7 +489,7 @@ GameObject:
   - component: {fileID: 111342618786131120}
   - component: {fileID: 114847495729766850}
   m_Layer: 18
-  m_Name: join_
+  m_Name: joinAthletic_
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -663,7 +663,7 @@ Transform:
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1487518173370092}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 2, y: 184, z: 0}
+  m_LocalPosition: {x: 2, y: 183, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 4035906615032416}
@@ -888,7 +888,7 @@ Transform:
   m_GameObject: {fileID: 1983650994634962}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1.5, y: 1.5, z: 1}
+  m_LocalScale: {x: 1.2, y: 1.2, z: 1}
   m_Children:
   - {fileID: 4035906615032416}
   m_Father: {fileID: 4680784161146278}
@@ -1455,8 +1455,8 @@ MonoBehaviour:
   updateAnchors: 1
   mColor: {r: 1, g: 1, b: 1, a: 1}
   mPivot: 4
-  mWidth: 880
-  mHeight: 648
+  mWidth: 696
+  mHeight: 507
   mDepth: -50
   autoResizeBoxCollider: 0
   hideIfOffScreen: 0