Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Y
ygopro2
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Locked Files
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Security & Compliance
Security & Compliance
Dependency List
License Compliance
Packages
Packages
Container Registry
Analytics
Analytics
CI / CD
Code Review
Insights
Issues
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nanahira
ygopro2
Commits
ddc71877
Commit
ddc71877
authored
Jan 17, 2019
by
Unicorn
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix OSX || LINUX
parent
f41b50ec
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
75 additions
and
24 deletions
+75
-24
Assets/SibylSystem/Config.cs
Assets/SibylSystem/Config.cs
+1
-1
Assets/SibylSystem/Menu/Menu.cs
Assets/SibylSystem/Menu/Menu.cs
+1
-1
Assets/SibylSystem/Program.cs
Assets/SibylSystem/Program.cs
+2
-1
Assets/SibylSystem/ResourceManagers/GameStringHelper.cs
Assets/SibylSystem/ResourceManagers/GameStringHelper.cs
+18
-18
Assets/SibylSystem/ResourceManagers/GameTextureManager.cs
Assets/SibylSystem/ResourceManagers/GameTextureManager.cs
+51
-1
Assets/SibylSystem/selectServer/SelectServer.cs
Assets/SibylSystem/selectServer/SelectServer.cs
+2
-2
Assets/transUI/prefab/trans_menu.prefab
Assets/transUI/prefab/trans_menu.prefab
+0
-0
No files found.
Assets/SibylSystem/Config.cs
View file @
ddc71877
...
...
@@ -3,7 +3,7 @@ using System.Collections.Generic;
using
System.IO
;
public
static
class
Config
{
public
static
uint
ClientVersion
=
0x134
4
;
public
static
uint
ClientVersion
=
0x134
8
;
class
oneString
{
...
...
Assets/SibylSystem/Menu/Menu.cs
View file @
ddc71877
...
...
@@ -21,7 +21,7 @@ public class Menu : WindowServantSP
UIHelper
.
registEvent
(
gameObject
,
"single_"
,
onClickPizzle
);
//UIHelper.registEvent(gameObject, "ai_", onClickAI);
UIHelper
.
registEvent
(
gameObject
,
"exit_"
,
onClickExit
);
(
new
Thread
(
up
)).
Start
();
//
(new Thread(up)).Start();
}
public
override
void
show
()
...
...
Assets/SibylSystem/Program.cs
View file @
ddc71877
...
...
@@ -829,7 +829,8 @@ public class Program : MonoBehaviour
{
Screen
.
SetResolution
(
1300
,
700
,
false
);
}
Application
.
targetFrameRate
=
120
;
QualitySettings
.
vSyncCount
=
0
;
Application
.
targetFrameRate
=
144
;
mouseParticle
=
Instantiate
(
new_mouse
);
instance
=
this
;
initialize
();
...
...
Assets/SibylSystem/ResourceManagers/GameStringHelper.cs
View file @
ddc71877
...
...
@@ -119,29 +119,29 @@ public class GameStringHelper
public
static
string
getName
(
YGOSharp
.
Card
card
)
{
string
limitot
=
""
;
switch
(
card
.
Ot
)
{
case
1
:
limitot
=
"[OCG] "
;
break
;
case
2
:
limitot
=
"[TCG] "
;
break
;
case
3
:
limitot
=
"[OCG/TCG] "
;
break
;
case
4
:
limitot
=
"[Anime] "
;
break
;
}
string
limitot
=
""
;
switch
(
card
.
Ot
)
{
case
1
:
limitot
=
"[OCG] "
;
break
;
case
2
:
limitot
=
"[TCG] "
;
break
;
case
3
:
limitot
=
"[OCG/TCG] "
;
break
;
case
4
:
limitot
=
"[Anime] "
;
break
;
}
string
re
=
""
;
try
{
re
+=
"[b]"
+
card
.
Name
+
"[/b]"
;
re
+=
"\n"
;
re
+=
"[sup]"
+
limitot
+
"[/sup]"
;
re
+=
"\r"
;
re
+=
"[sup]"
+
limitot
+
"[/sup]"
;
re
+=
"\r"
;
re
+=
"[sup]"
+
card
.
Id
.
ToString
()
+
"[/sup]"
;
re
+=
"\n"
;
}
...
...
Assets/SibylSystem/ResourceManagers/GameTextureManager.cs
View file @
ddc71877
...
...
@@ -271,6 +271,7 @@ public class GameTextureManager
if
(
File
.
Exists
(
"picture/closeup/"
+
pic
.
code
.
ToString
()
+
".png"
))
{
string
path
=
"picture/closeup/"
+
pic
.
code
.
ToString
()
+
".png"
;
#
if
UNITY_EDITOR
||
UNITY_STANDALONE_WIN
//编译器、Windows
BitmapHelper
bitmap
=
new
BitmapHelper
(
path
);
int
left
;
int
right
;
...
...
@@ -301,6 +302,21 @@ public class GameTextureManager
}
caculateK
(
pic
);
/*
* 以上处理其他平台无法正常使用
* 暂时只能直接贴图,以后再处理
*/
#
elif
UNITY_STANDALONE_OSX
||
UNITY_STANDALONE_LINUX
//Mac OS X、Linux
byte
[]
data
;
using
(
FileStream
file
=
new
FileStream
(
path
,
FileMode
.
Open
,
FileAccess
.
Read
))
{
file
.
Seek
(
0
,
SeekOrigin
.
Begin
);
data
=
new
byte
[
file
.
Length
];
file
.
Read
(
data
,
0
,
(
int
)
file
.
Length
);
}
pic
.
data
=
data
;
#
endif
if
(!
loadedList
.
ContainsKey
(
hashPic
(
pic
.
code
,
pic
.
type
)))
{
loadedList
.
Add
(
hashPic
(
pic
.
code
,
pic
.
type
),
pic
);
...
...
@@ -573,6 +589,7 @@ public class GameTextureManager
string
path
=
"picture/closeup/"
+
pic
.
code
.
ToString
()
+
".png"
;
if
(!
File
.
Exists
(
path
))
{
#
if
UNITY_EDITOR
||
UNITY_STANDALONE_WIN
//编译器、Windows
path
=
"picture/card/"
+
pic
.
code
.
ToString
()
+
".png"
;
if
(!
File
.
Exists
(
path
))
{
...
...
@@ -600,9 +617,27 @@ public class GameTextureManager
softVtype
(
pic
,
0.5f
);
pic
.
k
=
1
;
//pic.autoMade = true;
/*
* 以上处理其他平台无法正常使用
* 暂时只能直接贴图,以后再处理
*/
#
elif
UNITY_STANDALONE_OSX
||
UNITY_STANDALONE_LINUX
//Mac OS X、Linux
path
=
"picture/null.png"
;
byte
[]
data
;
using
(
FileStream
file
=
new
FileStream
(
path
,
FileMode
.
Open
,
FileAccess
.
Read
))
{
file
.
Seek
(
0
,
SeekOrigin
.
Begin
);
data
=
new
byte
[
file
.
Length
];
file
.
Read
(
data
,
0
,
(
int
)
file
.
Length
);
}
pic
.
data
=
data
;
#
endif
}
else
{
#
if
UNITY_EDITOR
||
UNITY_STANDALONE_WIN
//编译器、Windows
BitmapHelper
bitmap
=
new
BitmapHelper
(
path
);
int
left
;
int
right
;
...
...
@@ -654,6 +689,21 @@ public class GameTextureManager
softVtype
(
pic
,
0.7f
);
}
caculateK
(
pic
);
/*
* 以上处理其他平台无法正常使用
* 暂时只能直接贴图,以后再处理
*/
#
elif
UNITY_STANDALONE_OSX
||
UNITY_STANDALONE_LINUX
//Mac OS X、Linux
byte
[]
data
;
using
(
FileStream
file
=
new
FileStream
(
path
,
FileMode
.
Open
,
FileAccess
.
Read
))
{
file
.
Seek
(
0
,
SeekOrigin
.
Begin
);
data
=
new
byte
[
file
.
Length
];
file
.
Read
(
data
,
0
,
(
int
)
file
.
Length
);
}
pic
.
data
=
data
;
#
endif
}
if
(!
loadedList
.
ContainsKey
(
hashPic
(
pic
.
code
,
pic
.
type
)))
...
...
@@ -694,7 +744,7 @@ public class GameTextureManager
if
(
a
>
alpha
)
a
=
alpha
;
}
if
(
w
<
empWidth
)
if
(
a
>
((
float
)
w
)
/
(
float
)
empWidth
)
a
=
((
float
)
w
)
/
(
float
)
empWidth
;
...
...
Assets/SibylSystem/selectServer/SelectServer.cs
View file @
ddc71877
...
...
@@ -144,8 +144,8 @@ public class SelectServer : WindowServantSP
string
versionString
=
UIHelper
.
getByName
<
UIInput
>(
gameObject
,
"version_"
).
value
;
if
(
versionString
==
""
)
{
UIHelper
.
getByName
<
UIInput
>(
gameObject
,
"version_"
).
value
=
"0x13
3d
"
;
versionString
=
"0x13
3d
"
;
UIHelper
.
getByName
<
UIInput
>(
gameObject
,
"version_"
).
value
=
"0x13
48
"
;
versionString
=
"0x13
48
"
;
}
KF_onlineGame
(
Name
,
ipString
,
portString
,
versionString
,
pswString
);
}
...
...
Assets/transUI/prefab/trans_menu.prefab
View file @
ddc71877
No preview for this file type
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment