Commit 44e0083e authored by Unicorn369's avatar Unicorn369

fix

parent 93d784ca
......@@ -827,6 +827,18 @@ public class GameTextureManager
df.Download("http://download.ygo2019.xyz/ygopro2-data/expansions/pics/" + pic.code.ToString() + ".jpg", "picture/cardIn8thEdition/" + pic.code.ToString() + ".jpg");
path = "picture/cardIn8thEdition/" + pic.code.ToString() + ".jpg";
}
LoadCardPicture(pic, path);
}
catch (Exception e)
{
Debug.Log("e 2" + e.ToString());
}
}
private static void LoadCardPicture(PictureResource pic, string path)
{
try
{
if (!File.Exists(path))
{
if (pic.code > 0)
......
......@@ -756,6 +756,7 @@ public class Servant
UIHelper.InterGameObject(currentMSwindow);
UIHelper.trySetLableText(currentMSwindow, "hint_", hint);
UIHelper.registEvent(currentMSwindow, "input_", ES_RMSpremono, null, "yes_");
UIHelper.registEvent(currentMSwindow, "exit_", ES_RMSpremono, new messageSystemValue());
UIHelper.getByName<UIInput>(currentMSwindow, "input_").value = default_;
Program.go(100, () => { UIHelper.getByName<UIInput>(currentMSwindow, "input_").isSelected = true; });
}
......@@ -801,7 +802,7 @@ public class Servant
string face = "texture/face/" + nameFace + ".jpg";
//开始下载
HttpDldFile df = new HttpDldFile();
if (inputUrl.value.Substring(0, 4) == "http")
if (inputUrl.value.Length >= 4 && inputUrl.value.Substring(0, 4) == "http")
{
url = inputUrl.value;
df.Download(url, face); //使用自定义Url
......
......@@ -159,12 +159,12 @@ Transform:
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 185494}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -3, y: 40.8, z: 0}
m_LocalPosition: {x: -3, y: 30, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 467964}
m_Father: {fileID: 430068}
m_RootOrder: 4
m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!4 &417068
Transform:
......@@ -173,7 +173,7 @@ Transform:
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 169056}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -355, y: -135, z: 0}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 481870}
......@@ -195,6 +195,7 @@ Transform:
- {fileID: 456270}
- {fileID: 467190}
- {fileID: 454160}
- {fileID: 4508122029076288}
- {fileID: 401994}
m_Father: {fileID: 417068}
m_RootOrder: 1
......@@ -245,7 +246,7 @@ Transform:
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 171832}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -166, y: 7, z: 0}
m_LocalPosition: {x: -166, y: 8, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 401994}
......@@ -905,3 +906,163 @@ Prefab:
m_ParentPrefab: {fileID: 0}
m_RootGameObject: {fileID: 169056}
m_IsPrefabParent: 1
--- !u!1 &1534360114270112
GameObject:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
serializedVersion: 5
m_Component:
- component: {fileID: 4508122029076288}
- component: {fileID: 65973495383826234}
- component: {fileID: 114854050376045720}
- component: {fileID: 111046173475100260}
- component: {fileID: 114712651790018024}
- component: {fileID: 114287065172711596}
m_Layer: 5
m_Name: exit_
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &4508122029076288
Transform:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1534360114270112}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 225, y: 130, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 430068}
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!65 &65973495383826234
BoxCollider:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1534360114270112}
m_Material: {fileID: 0}
m_IsTrigger: 0
m_Enabled: 1
serializedVersion: 2
m_Size: {x: 20, y: 20, z: 0}
m_Center: {x: 0, y: 0, z: 0}
--- !u!111 &111046173475100260
Animation:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1534360114270112}
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: 1
m_AnimatePhysics: 0
m_CullingType: 0
--- !u!114 &114287065172711596
MonoBehaviour:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1534360114270112}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 1b3dc54f924693f41b5cbecb267e647a, type: 3}
m_Name:
m_EditorClassIdentifier:
leftAnchor:
target: {fileID: 0}
relative: 1
absolute: -39
rightAnchor:
target: {fileID: 0}
relative: 1
absolute: -19
bottomAnchor:
target: {fileID: 0}
relative: 1
absolute: -47
topAnchor:
target: {fileID: 0}
relative: 1
absolute: -27
updateAnchors: 1
mColor: {r: 1, g: 1, b: 1, a: 1}
mPivot: 4
mWidth: 20
mHeight: 20
mDepth: 1
autoResizeBoxCollider: 1
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
mAtlas: {fileID: 11422656, guid: 1b5c469d95cc74b4e9f655da6f9dd392, type: 2}
mSpriteName: close
mFillCenter: 1
--- !u!114 &114712651790018024
MonoBehaviour:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1534360114270112}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 3f093ad5830afe44aba6efa8b8a5d5b9, type: 3}
m_Name:
m_EditorClassIdentifier:
target: {fileID: 111046173475100260}
animator: {fileID: 0}
clipName:
trigger: 1
playDirection: 1
resetOnPlay: 0
clearSelection: 0
ifDisabledOnPlay: 0
disableWhenFinished: 0
onFinished: []
eventReceiver: {fileID: 0}
callWhenFinished:
--- !u!114 &114854050376045720
MonoBehaviour:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1534360114270112}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 1fdca5042b1d12a4890ec1bd4f04290d, type: 3}
m_Name:
m_EditorClassIdentifier:
tweenTarget: {fileID: 1534360114270112}
hover: {r: 1, g: 1, b: 1, a: 1}
pressed: {r: 1, g: 1, b: 1, a: 1}
disabledColor: {r: 1, g: 1, b: 1, a: 1}
duration: 0.2
dragHighlight: 0
hoverSprite:
pressedSprite:
disabledSprite:
hoverSprite2D: {fileID: 0}
pressedSprite2D: {fileID: 0}
disabledSprite2D: {fileID: 0}
pixelSnap: 0
onClick: []
mTextureOutNormal:
mTextureOutPressed:
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