Commit c0bcf1d0 authored by Unicorn369's avatar Unicorn369

small fix

parent dfca82e4
......@@ -229,27 +229,27 @@ public class GameTextureManager
switch (pic.type)
{
case GameTextureType.card_feature:
{
ProcessingCardFeature(pic);
break;
}
{
ProcessingCardFeature(pic);
break;
}
case GameTextureType.card_picture:
{
ProcessingCardPicture(pic);
break;
}
{
ProcessingCardPicture(pic);
break;
}
case GameTextureType.card_verticle_drawing:
{
ProcessingVerticleDrawing(pic);
break;
}
{
ProcessingVerticleDrawing(pic);
break;
}
}
}
}
}
catch (Exception e)
{
Debug.Log("erroe 1" + e.ToString());
Debug.Log("error 1" + e.ToString());
}
}
}
......@@ -1036,4 +1036,3 @@ public class GameTextureManager
main.Start();
}
}
......@@ -32,6 +32,14 @@ public class HttpDldFile
{
client.Timeout = 3500;
}
if (Path.GetExtension(filename).Contains("cdb"))
{
client.Timeout = 30000;
}
if (Path.GetExtension(filename).Contains("conf"))
{
client.Timeout = 3000;
}
client.DownloadFile(new Uri(url), filename + ".tmp");
}
flag = true;
......@@ -96,4 +104,4 @@ public class TimeoutWebClient : WebClient
request.Timeout = Timeout;
return request;
}
}
\ No newline at end of file
}
......@@ -112,4 +112,4 @@ public class RoomList : WindowServantSP
Program.I().roomList.hide();
Program.I().selectServer.KF_onlineGame(Name, ipString, portString, versionString, pswString);
}
}
\ No newline at end of file
}
......@@ -52,7 +52,7 @@ public class Setting : WindowServant2D
{
if (collection[i].name.Length > 0 && collection[i].name[0] == '*')
{
if (collection[i].name == "*mouseParticle" || collection[i].name == "*showOff" || collection[i].name == "*Efield")
if (collection[i].name == "*mouseParticle" || collection[i].name == "*showOff" || collection[i].name == "*Efield" || collection[i].name == "*AutoPicDownload")
{
collection[i].value = UIHelper.fromStringToBool(Config.Get(collection[i].name, "1"));
}
......
......@@ -163,7 +163,7 @@ Transform:
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 107096}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -81, y: 10, z: 0}
m_LocalPosition: {x: -170, y: 10, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 481496}
......@@ -189,7 +189,7 @@ Transform:
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 150246}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -1446, y: -80, z: 0}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 448176}
......@@ -303,7 +303,7 @@ BoxCollider:
m_IsTrigger: 1
m_Enabled: 1
serializedVersion: 2
m_Size: {x: 172, y: 34, z: 0}
m_Size: {x: 350, y: 34, z: 0}
m_Center: {x: 0, y: 0, z: 0}
--- !u!65 &6581546
BoxCollider:
......@@ -501,13 +501,13 @@ MonoBehaviour:
updateAnchors: 1
mColor: {r: 1, g: 1, b: 1, a: 1}
mPivot: 4
mWidth: 172
mWidth: 350
mHeight: 34
mDepth: 20
autoResizeBoxCollider: 1
hideIfOffScreen: 0
keepAspectRatio: 0
aspectRatio: 5.0588236
aspectRatio: 10.294118
mType: 1
mFillDirection: 4
mFillAmount: 1
......@@ -872,13 +872,13 @@ MonoBehaviour:
updateAnchors: 1
mColor: {r: 1, g: 1, b: 1, a: 0.40392157}
mPivot: 0
mWidth: 162
mWidth: 340
mHeight: 27
mDepth: 21
autoResizeBoxCollider: 0
hideIfOffScreen: 0
keepAspectRatio: 0
aspectRatio: 7.6136365
aspectRatio: 6
keepCrispWhenShrunk: 1
mTrueTypeFont: {fileID: 12800000, guid: f775853fdfd14bb47934543e95c3bae3, type: 3}
mFont: {fileID: 0}
......
......@@ -2995,7 +2995,7 @@ MonoBehaviour:
keepCrispWhenShrunk: 1
mTrueTypeFont: {fileID: 12800000, guid: f775853fdfd14bb47934543e95c3bae3, type: 3}
mFont: {fileID: 0}
mText: YGOPro2 Player
mText: Komeiji Koishi
mFontSize: 18
mFontStyle: 0
mAlignment: 1
......@@ -4603,7 +4603,7 @@ MonoBehaviour:
keepCrispWhenShrunk: 1
mTrueTypeFont: {fileID: 12800000, guid: f775853fdfd14bb47934543e95c3bae3, type: 3}
mFont: {fileID: 0}
mText: 0x1348
mText: 0x1349
mFontSize: 18
mFontStyle: 0
mAlignment: 1
......
......@@ -161,7 +161,7 @@ Transform:
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 125396}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -495, y: -126, z: 0}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 410700}
......@@ -273,7 +273,7 @@ Transform:
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 163322}
m_LocalRotation: {x: 0, y: 0, z: 0.7071068, w: 0.7071067}
m_LocalPosition: {x: -2, y: -86.055, z: 0}
m_LocalPosition: {x: -1.5, y: -86, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 462324}
......@@ -377,7 +377,7 @@ MonoBehaviour:
mPivot: 4
mWidth: 225
mHeight: 78
mDepth: 3
mDepth: 2
autoResizeBoxCollider: 1
hideIfOffScreen: 0
keepAspectRatio: 0
......@@ -394,7 +394,7 @@ MonoBehaviour:
mEffectStyle: 1
mEffectColor: {r: 0, g: 0, b: 0, a: 1}
mSymbols: 1
mEffectDistance: {x: 2, y: 2}
mEffectDistance: {x: 1, y: 1}
mOverflow: 0
mMaterial: {fileID: 0}
mApplyGradient: 1
......@@ -456,12 +456,12 @@ MonoBehaviour:
mColor: {r: 1, g: 1, b: 1, a: 1}
mPivot: 4
mWidth: 457
mHeight: 7
mDepth: 3
mHeight: 8
mDepth: 2
autoResizeBoxCollider: 0
hideIfOffScreen: 0
keepAspectRatio: 0
aspectRatio: 65.28571
aspectRatio: 57.125
mType: 0
mFillDirection: 4
mFillAmount: 1
......@@ -638,7 +638,7 @@ MonoBehaviour:
mPivot: 4
mWidth: 390
mHeight: 180
mDepth: 15
mDepth: 10
autoResizeBoxCollider: 1
hideIfOffScreen: 0
keepAspectRatio: 0
......@@ -702,13 +702,13 @@ MonoBehaviour:
updateAnchors: 1
mColor: {r: 1, g: 1, b: 1, a: 1}
mPivot: 4
mWidth: 79
mWidth: 80
mHeight: 6
mDepth: 3
mDepth: 2
autoResizeBoxCollider: 0
hideIfOffScreen: 0
keepAspectRatio: 0
aspectRatio: 13.166667
aspectRatio: 13.333333
mType: 0
mFillDirection: 4
mFillAmount: 1
......@@ -740,7 +740,7 @@ MonoBehaviour:
contentRect: {fileID: 0}
dragEffect: 2
momentumAmount: 35
scale: {x: 2, y: 2, z: 0}
scale: {x: 1, y: 1, z: 0}
scrollWheelFactor: 0
--- !u!114 &11465794
MonoBehaviour:
......@@ -774,7 +774,7 @@ MonoBehaviour:
mPivot: 4
mWidth: 222
mHeight: 78
mDepth: 3
mDepth: 2
autoResizeBoxCollider: 1
hideIfOffScreen: 0
keepAspectRatio: 0
......
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