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
List
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
Xu Chenxi
ygopro2
Commits
378d97f2
Commit
378d97f2
authored
Apr 23, 2019
by
Unicorn369
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
update
parent
b05d2127
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
146 additions
and
51 deletions
+146
-51
Assets/SibylSystem/Program.cs
Assets/SibylSystem/Program.cs
+18
-14
Assets/SibylSystem/Room/RoomList.cs
Assets/SibylSystem/Room/RoomList.cs
+1
-1
Assets/SibylSystem/selectServer/SelectServer.cs
Assets/SibylSystem/selectServer/SelectServer.cs
+11
-16
Assets/transUI/prefab/selectServerWithRoomlist.prefab
Assets/transUI/prefab/selectServerWithRoomlist.prefab
+116
-20
No files found.
Assets/SibylSystem/Program.cs
View file @
378d97f2
...
@@ -301,7 +301,7 @@ public class Program : MonoBehaviour
...
@@ -301,7 +301,7 @@ public class Program : MonoBehaviour
*/
*/
ANDROID_GAME_PATH
=
jo
.
Call
<
string
>(
"GamePath"
,
"/ygopro2/"
);
ANDROID_GAME_PATH
=
jo
.
Call
<
string
>(
"GamePath"
,
"/ygopro2/"
);
if
(!
File
.
Exists
(
ANDROID_GAME_PATH
+
"updates/version2.
0
.txt"
))
if
(!
File
.
Exists
(
ANDROID_GAME_PATH
+
"updates/version2.
3
.txt"
))
{
{
string
filePath
=
Application
.
streamingAssetsPath
+
"/ygopro2-data.zip"
;
string
filePath
=
Application
.
streamingAssetsPath
+
"/ygopro2-data.zip"
;
var
www
=
new
WWW
(
filePath
);
var
www
=
new
WWW
(
filePath
);
...
@@ -321,7 +321,7 @@ public class Program : MonoBehaviour
...
@@ -321,7 +321,7 @@ public class Program : MonoBehaviour
ExtractZipFile
(
bytes
,
ANDROID_GAME_PATH
);
ExtractZipFile
(
bytes
,
ANDROID_GAME_PATH
);
}
}
/* //选择性更新
/* //选择性更新
if (!File.Exists(ANDROID_GAME_PATH + "updates/
version2.2.2
.txt"))
if (!File.Exists(ANDROID_GAME_PATH + "updates/
image_version1.3
.txt"))
{
{
string filePath = Application.streamingAssetsPath + "/update.zip";
string filePath = Application.streamingAssetsPath + "/update.zip";
var www = new WWW(filePath);
var www = new WWW(filePath);
...
@@ -336,7 +336,7 @@ public class Program : MonoBehaviour
...
@@ -336,7 +336,7 @@ public class Program : MonoBehaviour
#elif UNITY_IPHONE //iPhone
#elif UNITY_IPHONE //iPhone
string
GamePaths
=
Application
.
persistentDataPath
+
"/ygopro2/"
;
string
GamePaths
=
Application
.
persistentDataPath
+
"/ygopro2/"
;
if
(!
File
.
Exists
(
GamePaths
+
"updates/version2.
0
.txt"
))
if
(!
File
.
Exists
(
GamePaths
+
"updates/version2.
3
.txt"
))
{
{
string
filePath
=
Application
.
streamingAssetsPath
+
"/ygopro2-data.zip"
;
string
filePath
=
Application
.
streamingAssetsPath
+
"/ygopro2-data.zip"
;
ExtractZipFile
(
System
.
IO
.
File
.
ReadAllBytes
(
filePath
),
GamePaths
);
ExtractZipFile
(
System
.
IO
.
File
.
ReadAllBytes
(
filePath
),
GamePaths
);
...
@@ -400,6 +400,8 @@ public class Program : MonoBehaviour
...
@@ -400,6 +400,8 @@ public class Program : MonoBehaviour
}
}
}
}
if
(
Directory
.
Exists
(
"pack"
))
{
fileInfos
=
(
new
DirectoryInfo
(
"pack"
)).
GetFiles
();
fileInfos
=
(
new
DirectoryInfo
(
"pack"
)).
GetFiles
();
//fileInfos = (new DirectoryInfo("pack" + AppLanguage.LanguageDir())).GetFiles();
//fileInfos = (new DirectoryInfo("pack" + AppLanguage.LanguageDir())).GetFiles();
for
(
int
i
=
0
;
i
<
fileInfos
.
Length
;
i
++)
for
(
int
i
=
0
;
i
<
fileInfos
.
Length
;
i
++)
...
@@ -414,6 +416,8 @@ public class Program : MonoBehaviour
...
@@ -414,6 +416,8 @@ public class Program : MonoBehaviour
}
}
}
}
YGOSharp
.
PacksManager
.
initializeSec
();
YGOSharp
.
PacksManager
.
initializeSec
();
}
initializeALLservants
();
initializeALLservants
();
loadResources
();
loadResources
();
...
@@ -422,10 +426,10 @@ public class Program : MonoBehaviour
...
@@ -422,10 +426,10 @@ public class Program : MonoBehaviour
{
{
if
(
File
.
Exists
(
"pics.zip"
))
{
if
(
File
.
Exists
(
"pics.zip"
))
{
jo
.
Call
(
"doExtractZipFile"
,
"pics.zip"
,
ANDROID_GAME_PATH
);
jo
.
Call
(
"doExtractZipFile"
,
"pics.zip"
,
ANDROID_GAME_PATH
);
File
.
Copy
(
"updates/version2.
0
.txt"
,
"updates/image_version1.2.txt"
,
true
);
File
.
Copy
(
"updates/version2.
3
.txt"
,
"updates/image_version1.2.txt"
,
true
);
}
else
if
(
File
.
Exists
(
ANDROID_GAME_PATH
+
"../ygocore/pics.zip"
))
{
}
else
if
(
File
.
Exists
(
ANDROID_GAME_PATH
+
"../ygocore/pics.zip"
))
{
jo
.
Call
(
"doExtractZipFile"
,
ANDROID_GAME_PATH
+
"../ygocore/pics.zip"
,
ANDROID_GAME_PATH
);
jo
.
Call
(
"doExtractZipFile"
,
ANDROID_GAME_PATH
+
"../ygocore/pics.zip"
,
ANDROID_GAME_PATH
);
File
.
Copy
(
"updates/version2.
0
.txt"
,
"updates/image_version1.2.txt"
,
true
);
File
.
Copy
(
"updates/version2.
3
.txt"
,
"updates/image_version1.2.txt"
,
true
);
}
else
{
}
else
{
jo
.
Call
(
"doDownloadZipFile"
,
"https://github.com/Unicorn369/pro2_android_closeup/releases/download/1.0/pics.zip"
);
jo
.
Call
(
"doDownloadZipFile"
,
"https://github.com/Unicorn369/pro2_android_closeup/releases/download/1.0/pics.zip"
);
}
}
...
@@ -1035,7 +1039,7 @@ public class Program : MonoBehaviour
...
@@ -1035,7 +1039,7 @@ public class Program : MonoBehaviour
_padScroll
=
0
;
_padScroll
=
0
;
}
}
GUI
.
Label
(
new
Rect
(
10
,
5
,
200
,
200
),
"[Ver 2.
2.7
] "
+
"FPS: "
+
m_FPS
);
GUI
.
Label
(
new
Rect
(
10
,
5
,
200
,
200
),
"[Ver 2.
3
] "
+
"FPS: "
+
m_FPS
);
}
}
void
Update
()
void
Update
()
...
...
Assets/SibylSystem/Room/RoomList.cs
View file @
378d97f2
...
@@ -90,7 +90,7 @@ public class RoomList : WindowServantSP
...
@@ -90,7 +90,7 @@ public class RoomList : WindowServantSP
}
}
else
else
{
{
Program
.
PrintToChat
(
InterString
.
Get
(
"
抱歉!您尚未选择房间。
"
));
Program
.
PrintToChat
(
InterString
.
Get
(
"
请选择房间!!!
"
));
}
}
}
}
...
...
Assets/SibylSystem/selectServer/SelectServer.cs
View file @
378d97f2
...
@@ -17,8 +17,6 @@ public class SelectServer : WindowServantSP
...
@@ -17,8 +17,6 @@ public class SelectServer : WindowServantSP
UISprite
inputIP_
;
UISprite
inputIP_
;
UISprite
inputPort_
;
UISprite
inputPort_
;
static
bool
EditIpAndPort
;
public
override
void
initialize
()
public
override
void
initialize
()
{
{
createWindow
(
Program
.
I
().
new_ui_selectServer
);
createWindow
(
Program
.
I
().
new_ui_selectServer
);
...
@@ -83,7 +81,6 @@ public class SelectServer : WindowServantSP
...
@@ -83,7 +81,6 @@ public class SelectServer : WindowServantSP
UIHelper
.
getByName
<
UIInput
>(
gameObject
,
"port_"
).
value
=
"233"
;
UIHelper
.
getByName
<
UIInput
>(
gameObject
,
"port_"
).
value
=
"233"
;
Config
.
Set
(
"serversPicker"
,
"[OCG]Mercury233"
);
Config
.
Set
(
"serversPicker"
,
"[OCG]Mercury233"
);
EditIpAndPort
=
false
;
inputIP_
.
enabled
=
false
;
inputIP_
.
enabled
=
false
;
inputPort_
.
enabled
=
false
;
inputPort_
.
enabled
=
false
;
break
;
break
;
...
@@ -94,7 +91,6 @@ public class SelectServer : WindowServantSP
...
@@ -94,7 +91,6 @@ public class SelectServer : WindowServantSP
UIHelper
.
getByName
<
UIInput
>(
gameObject
,
"port_"
).
value
=
"7210"
;
UIHelper
.
getByName
<
UIInput
>(
gameObject
,
"port_"
).
value
=
"7210"
;
Config
.
Set
(
"serversPicker"
,
"[OCG]Koishi"
);
Config
.
Set
(
"serversPicker"
,
"[OCG]Koishi"
);
EditIpAndPort
=
false
;
inputIP_
.
enabled
=
false
;
inputIP_
.
enabled
=
false
;
inputPort_
.
enabled
=
false
;
inputPort_
.
enabled
=
false
;
break
;
break
;
...
@@ -105,7 +101,6 @@ public class SelectServer : WindowServantSP
...
@@ -105,7 +101,6 @@ public class SelectServer : WindowServantSP
UIHelper
.
getByName
<
UIInput
>(
gameObject
,
"port_"
).
value
=
"1311"
;
UIHelper
.
getByName
<
UIInput
>(
gameObject
,
"port_"
).
value
=
"1311"
;
Config
.
Set
(
"serversPicker"
,
"[TCG]Koishi"
);
Config
.
Set
(
"serversPicker"
,
"[TCG]Koishi"
);
EditIpAndPort
=
false
;
inputIP_
.
enabled
=
false
;
inputIP_
.
enabled
=
false
;
inputPort_
.
enabled
=
false
;
inputPort_
.
enabled
=
false
;
break
;
break
;
...
@@ -116,7 +111,6 @@ public class SelectServer : WindowServantSP
...
@@ -116,7 +111,6 @@ public class SelectServer : WindowServantSP
UIHelper
.
getByName
<
UIInput
>(
gameObject
,
"port_"
).
value
=
"765"
;
UIHelper
.
getByName
<
UIInput
>(
gameObject
,
"port_"
).
value
=
"765"
;
Config
.
Set
(
"serversPicker"
,
"[轮抽服]2Pick"
);
Config
.
Set
(
"serversPicker"
,
"[轮抽服]2Pick"
);
EditIpAndPort
=
false
;
inputIP_
.
enabled
=
false
;
inputIP_
.
enabled
=
false
;
inputPort_
.
enabled
=
false
;
inputPort_
.
enabled
=
false
;
break
;
break
;
...
@@ -127,7 +121,6 @@ public class SelectServer : WindowServantSP
...
@@ -127,7 +121,6 @@ public class SelectServer : WindowServantSP
UIHelper
.
getByName
<
UIInput
>(
gameObject
,
"port_"
).
value
=
"17225"
;
UIHelper
.
getByName
<
UIInput
>(
gameObject
,
"port_"
).
value
=
"17225"
;
Config
.
Set
(
"serversPicker"
,
"[OCG&TCG]한국서버"
);
Config
.
Set
(
"serversPicker"
,
"[OCG&TCG]한국서버"
);
EditIpAndPort
=
false
;
inputIP_
.
enabled
=
false
;
inputIP_
.
enabled
=
false
;
inputPort_
.
enabled
=
false
;
inputPort_
.
enabled
=
false
;
break
;
break
;
...
@@ -138,7 +131,6 @@ public class SelectServer : WindowServantSP
...
@@ -138,7 +131,6 @@ public class SelectServer : WindowServantSP
UIHelper
.
getByName
<
UIInput
>(
gameObject
,
"port_"
).
value
=
"7911"
;
UIHelper
.
getByName
<
UIInput
>(
gameObject
,
"port_"
).
value
=
"7911"
;
Config
.
Set
(
"serversPicker"
,
"[OCG&TCG]YGOhollow (JP)"
);
Config
.
Set
(
"serversPicker"
,
"[OCG&TCG]YGOhollow (JP)"
);
EditIpAndPort
=
false
;
inputIP_
.
enabled
=
false
;
inputIP_
.
enabled
=
false
;
inputPort_
.
enabled
=
false
;
inputPort_
.
enabled
=
false
;
break
;
break
;
...
@@ -152,7 +144,6 @@ public class SelectServer : WindowServantSP
...
@@ -152,7 +144,6 @@ public class SelectServer : WindowServantSP
Config
.
Set
(
"serversPicker"
,
"[Custom]"
);
Config
.
Set
(
"serversPicker"
,
"[Custom]"
);
}
}
EditIpAndPort
=
true
;
inputIP_
.
enabled
=
true
;
inputIP_
.
enabled
=
true
;
inputPort_
.
enabled
=
true
;
inputPort_
.
enabled
=
true
;
break
;
break
;
...
@@ -171,6 +162,7 @@ public class SelectServer : WindowServantSP
...
@@ -171,6 +162,7 @@ public class SelectServer : WindowServantSP
private
void
readString
(
string
str
)
private
void
readString
(
string
str
)
{
{
/*
str = str.Substring(1, str.Length - 1);
str = str.Substring(1, str.Length - 1);
string version = "", remain = "";
string version = "", remain = "";
string[] splited;
string[] splited;
...
@@ -209,6 +201,8 @@ public class SelectServer : WindowServantSP
...
@@ -209,6 +201,8 @@ public class SelectServer : WindowServantSP
inputPort.value = port;
inputPort.value = port;
}
}
inputPsw.value = psw;
inputPsw.value = psw;
*/
inputPsw
.
value
=
str
;
//inputVersion.value = version;
//inputVersion.value = version;
}
}
...
@@ -229,11 +223,11 @@ public class SelectServer : WindowServantSP
...
@@ -229,11 +223,11 @@ public class SelectServer : WindowServantSP
void
printFile
(
bool
first
)
void
printFile
(
bool
first
)
{
{
list
.
Clear
();
list
.
Clear
();
if
(
File
.
Exists
(
"config/
host
s.conf"
)
==
false
)
if
(
File
.
Exists
(
"config/
password
s.conf"
)
==
false
)
{
{
File
.
Create
(
"config/
host
s.conf"
).
Close
();
File
.
Create
(
"config/
password
s.conf"
).
Close
();
}
}
string
txtString
=
File
.
ReadAllText
(
"config/
host
s.conf"
);
string
txtString
=
File
.
ReadAllText
(
"config/
password
s.conf"
);
string
[]
lines
=
txtString
.
Replace
(
"\r"
,
""
).
Split
(
"\n"
);
string
[]
lines
=
txtString
.
Replace
(
"\r"
,
""
).
Split
(
"\n"
);
for
(
int
i
=
0
;
i
<
lines
.
Length
;
i
++)
for
(
int
i
=
0
;
i
<
lines
.
Length
;
i
++)
{
{
...
@@ -310,11 +304,12 @@ public class SelectServer : WindowServantSP
...
@@ -310,11 +304,12 @@ public class SelectServer : WindowServantSP
{
{
if
(
name
!=
""
)
if
(
name
!=
""
)
{
{
string
fantasty
=
"("
+
versionString
+
")"
+
ipString
+
":"
+
portString
+
" "
+
pswString
;
//string fantasty = "(" + versionString + ")" + ipString + ":" + portString + " " + pswString;
string
fantasty
=
pswString
;
list
.
items
.
Remove
(
fantasty
);
list
.
items
.
Remove
(
fantasty
);
list
.
items
.
Insert
(
0
,
fantasty
);
list
.
items
.
Insert
(
0
,
fantasty
);
list
.
value
=
fantasty
;
list
.
value
=
fantasty
;
if
(
list
.
items
.
Count
>
5
)
if
(
list
.
items
.
Count
>
5
)
{
{
list
.
items
.
RemoveAt
(
list
.
items
.
Count
-
1
);
list
.
items
.
RemoveAt
(
list
.
items
.
Count
-
1
);
}
}
...
@@ -323,9 +318,9 @@ public class SelectServer : WindowServantSP
...
@@ -323,9 +318,9 @@ public class SelectServer : WindowServantSP
{
{
all
+=
list
.
items
[
i
]
+
"\r\n"
;
all
+=
list
.
items
[
i
]
+
"\r\n"
;
}
}
File
.
WriteAllText
(
"config/
host
s.conf"
,
all
);
File
.
WriteAllText
(
"config/
password
s.conf"
,
all
);
printFile
(
false
);
printFile
(
false
);
(
new
Thread
(()
=>
{
TcpHelper
.
join
(
ipString
,
name
,
portString
,
pswString
,
versionString
);
})).
Start
();
(
new
Thread
(()
=>
{
TcpHelper
.
join
(
ipString
,
name
,
portString
,
pswString
,
versionString
);
})).
Start
();
}
}
else
else
{
{
...
...
Assets/transUI/prefab/selectServerWithRoomlist.prefab
View file @
378d97f2
...
@@ -362,7 +362,7 @@ GameObject:
...
@@ -362,7 +362,7 @@ GameObject:
-
component
:
{
fileID
:
461314
}
-
component
:
{
fileID
:
461314
}
-
component
:
{
fileID
:
11487460
}
-
component
:
{
fileID
:
11487460
}
m_Layer
:
18
m_Layer
:
18
m_Name
:
'
!lable'
m_Name
:
'
!lable
_
'
m_TagString
:
Untagged
m_TagString
:
Untagged
m_Icon
:
{
fileID
:
0
}
m_Icon
:
{
fileID
:
0
}
m_NavMeshLayer
:
0
m_NavMeshLayer
:
0
...
@@ -668,7 +668,7 @@ Transform:
...
@@ -668,7 +668,7 @@ Transform:
m_Children
:
m_Children
:
-
{
fileID
:
432674
}
-
{
fileID
:
432674
}
m_Father
:
{
fileID
:
472854
}
m_Father
:
{
fileID
:
472854
}
m_RootOrder
:
2
m_RootOrder
:
3
m_LocalEulerAnglesHint
:
{
x
:
0
,
y
:
0
,
z
:
0
}
m_LocalEulerAnglesHint
:
{
x
:
0
,
y
:
0
,
z
:
0
}
---
!u!4
&408120
---
!u!4
&408120
Transform
:
Transform
:
...
@@ -846,12 +846,12 @@ Transform:
...
@@ -846,12 +846,12 @@ Transform:
m_PrefabInternal
:
{
fileID
:
100100000
}
m_PrefabInternal
:
{
fileID
:
100100000
}
m_GameObject
:
{
fileID
:
159768
}
m_GameObject
:
{
fileID
:
159768
}
m_LocalRotation
:
{
x
:
0
,
y
:
0
,
z
:
0
,
w
:
1
}
m_LocalRotation
:
{
x
:
0
,
y
:
0
,
z
:
0
,
w
:
1
}
m_LocalPosition
:
{
x
:
1
52.7
,
y
:
0
,
z
:
0
}
m_LocalPosition
:
{
x
:
1
25
,
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
:
442160
}
-
{
fileID
:
442160
}
m_Father
:
{
fileID
:
472854
}
m_Father
:
{
fileID
:
472854
}
m_RootOrder
:
1
m_RootOrder
:
2
m_LocalEulerAnglesHint
:
{
x
:
0
,
y
:
0
,
z
:
0
}
m_LocalEulerAnglesHint
:
{
x
:
0
,
y
:
0
,
z
:
0
}
---
!u!4
&431974
---
!u!4
&431974
Transform
:
Transform
:
...
@@ -917,7 +917,7 @@ Transform:
...
@@ -917,7 +917,7 @@ Transform:
m_PrefabInternal
:
{
fileID
:
100100000
}
m_PrefabInternal
:
{
fileID
:
100100000
}
m_GameObject
:
{
fileID
:
184660
}
m_GameObject
:
{
fileID
:
184660
}
m_LocalRotation
:
{
x
:
0
,
y
:
0
,
z
:
0
,
w
:
1
}
m_LocalRotation
:
{
x
:
0
,
y
:
0
,
z
:
0
,
w
:
1
}
m_LocalPosition
:
{
x
:
-
125
,
y
:
12
,
z
:
0
}
m_LocalPosition
:
{
x
:
-
98
,
y
:
12
,
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
:
431316
}
m_Father
:
{
fileID
:
431316
}
...
@@ -986,12 +986,12 @@ Transform:
...
@@ -986,12 +986,12 @@ Transform:
m_PrefabParentObject
:
{
fileID
:
0
}
m_PrefabParentObject
:
{
fileID
:
0
}
m_PrefabInternal
:
{
fileID
:
100100000
}
m_PrefabInternal
:
{
fileID
:
100100000
}
m_GameObject
:
{
fileID
:
159702
}
m_GameObject
:
{
fileID
:
159702
}
m_LocalRotation
:
{
x
:
0
,
y
:
0
,
z
:
0
,
w
:
1
}
m_LocalRotation
:
{
x
:
-0
,
y
:
-0
,
z
:
-
0
,
w
:
1
}
m_LocalPosition
:
{
x
:
-35
,
y
:
0
,
z
:
0
}
m_LocalPosition
:
{
x
:
265
,
y
:
-0.0000038146973
,
z
:
0
}
m_LocalScale
:
{
x
:
1
,
y
:
1
,
z
:
1
}
m_LocalScale
:
{
x
:
1
.0001493
,
y
:
1.0001488
,
z
:
1.0001488
}
m_Children
:
[]
m_Children
:
[]
m_Father
:
{
fileID
:
472854
}
m_Father
:
{
fileID
:
472854
}
m_RootOrder
:
0
m_RootOrder
:
1
m_LocalEulerAnglesHint
:
{
x
:
0
,
y
:
0
,
z
:
0
}
m_LocalEulerAnglesHint
:
{
x
:
0
,
y
:
0
,
z
:
0
}
---
!u!4
&472854
---
!u!4
&472854
Transform
:
Transform
:
...
@@ -1003,6 +1003,7 @@ Transform:
...
@@ -1003,6 +1003,7 @@ Transform:
m_LocalPosition
:
{
x
:
-113.8
,
y
:
-60
,
z
:
0
}
m_LocalPosition
:
{
x
:
-113.8
,
y
:
-60
,
z
:
0
}
m_LocalScale
:
{
x
:
1
,
y
:
1
,
z
:
1
}
m_LocalScale
:
{
x
:
1
,
y
:
1
,
z
:
1
}
m_Children
:
m_Children
:
-
{
fileID
:
4620669052562040
}
-
{
fileID
:
461314
}
-
{
fileID
:
461314
}
-
{
fileID
:
431316
}
-
{
fileID
:
431316
}
-
{
fileID
:
407960
}
-
{
fileID
:
407960
}
...
@@ -1116,7 +1117,7 @@ BoxCollider:
...
@@ -1116,7 +1117,7 @@ BoxCollider:
m_IsTrigger
:
1
m_IsTrigger
:
1
m_Enabled
:
1
m_Enabled
:
1
serializedVersion
:
2
serializedVersion
:
2
m_Size
:
{
x
:
2
55
,
y
:
34
,
z
:
0
}
m_Size
:
{
x
:
2
00
,
y
:
34
,
z
:
0
}
m_Center
:
{
x
:
0
,
y
:
0
,
z
:
0
}
m_Center
:
{
x
:
0
,
y
:
0
,
z
:
0
}
---
!u!65
&6512340
---
!u!65
&6512340
BoxCollider
:
BoxCollider
:
...
@@ -1735,13 +1736,13 @@ MonoBehaviour:
...
@@ -1735,13 +1736,13 @@ MonoBehaviour:
updateAnchors
:
1
updateAnchors
:
1
mColor
:
{
r
:
1
,
g
:
1
,
b
:
1
,
a
:
1
}
mColor
:
{
r
:
1
,
g
:
1
,
b
:
1
,
a
:
1
}
mPivot
:
4
mPivot
:
4
mWidth
:
2
55
mWidth
:
2
00
mHeight
:
34
mHeight
:
34
mDepth
:
20
mDepth
:
20
autoResizeBoxCollider
:
1
autoResizeBoxCollider
:
1
hideIfOffScreen
:
0
hideIfOffScreen
:
0
keepAspectRatio
:
0
keepAspectRatio
:
0
aspectRatio
:
7.5
aspectRatio
:
5.882353
mType
:
1
mType
:
1
mFillDirection
:
4
mFillDirection
:
4
mFillAmount
:
1
mFillAmount
:
1
...
@@ -2008,13 +2009,13 @@ MonoBehaviour:
...
@@ -2008,13 +2009,13 @@ MonoBehaviour:
updateAnchors
:
1
updateAnchors
:
1
mColor
:
{
r
:
1
,
g
:
1
,
b
:
1
,
a
:
1
}
mColor
:
{
r
:
1
,
g
:
1
,
b
:
1
,
a
:
1
}
mPivot
:
4
mPivot
:
4
mWidth
:
30
0
mWidth
:
15
0
mHeight
:
28
mHeight
:
28
mDepth
:
100
mDepth
:
100
autoResizeBoxCollider
:
0
autoResizeBoxCollider
:
0
hideIfOffScreen
:
0
hideIfOffScreen
:
0
keepAspectRatio
:
0
keepAspectRatio
:
0
aspectRatio
:
10.714286
aspectRatio
:
5.357143
---
!u!114
&11435380
---
!u!114
&11435380
MonoBehaviour
:
MonoBehaviour
:
m_ObjectHideFlags
:
1
m_ObjectHideFlags
:
1
...
@@ -2770,13 +2771,13 @@ MonoBehaviour:
...
@@ -2770,13 +2771,13 @@ MonoBehaviour:
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
:
248
mWidth
:
193
mHeight
:
24
mHeight
:
24
mDepth
:
21
mDepth
:
21
autoResizeBoxCollider
:
0
autoResizeBoxCollider
:
0
hideIfOffScreen
:
0
hideIfOffScreen
:
0
keepAspectRatio
:
0
keepAspectRatio
:
0
aspectRatio
:
10.333333
aspectRatio
:
8.041667
keepCrispWhenShrunk
:
1
keepCrispWhenShrunk
:
1
mTrueTypeFont
:
{
fileID
:
12800000
,
guid
:
f775853fdfd14bb47934543e95c3bae3
,
type
:
3
}
mTrueTypeFont
:
{
fileID
:
12800000
,
guid
:
f775853fdfd14bb47934543e95c3bae3
,
type
:
3
}
mFont
:
{
fileID
:
0
}
mFont
:
{
fileID
:
0
}
...
@@ -2938,7 +2939,7 @@ MonoBehaviour:
...
@@ -2938,7 +2939,7 @@ MonoBehaviour:
mText
:
"
\u7AEF\u53E3
"
mText
:
"
\u7AEF\u53E3
"
mFontSize
:
18
mFontSize
:
18
mFontStyle
:
0
mFontStyle
:
0
mAlignment
:
2
mAlignment
:
1
mEncoding
:
0
mEncoding
:
0
mMaxLineCount
:
1
mMaxLineCount
:
1
mEffectStyle
:
0
mEffectStyle
:
0
...
@@ -3195,17 +3196,17 @@ MonoBehaviour:
...
@@ -3195,17 +3196,17 @@ MonoBehaviour:
updateAnchors
:
1
updateAnchors
:
1
mColor
:
{
r
:
1
,
g
:
1
,
b
:
1
,
a
:
1
}
mColor
:
{
r
:
1
,
g
:
1
,
b
:
1
,
a
:
1
}
mPivot
:
4
mPivot
:
4
mWidth
:
12
0
mWidth
:
5
0
mHeight
:
26
mHeight
:
26
mDepth
:
25
mDepth
:
25
autoResizeBoxCollider
:
0
autoResizeBoxCollider
:
0
hideIfOffScreen
:
0
hideIfOffScreen
:
0
keepAspectRatio
:
0
keepAspectRatio
:
0
aspectRatio
:
4.6153846
aspectRatio
:
1.9230769
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
:
"
\u
4E3B\u673A\u5730\u5740
\uFF1A
"
mText
:
"
\u
7AEF\u53E3
\uFF1A
"
mFontSize
:
22
mFontSize
:
22
mFontStyle
:
0
mFontStyle
:
0
mAlignment
:
3
mAlignment
:
3
...
@@ -3488,3 +3489,98 @@ Prefab:
...
@@ -3488,3 +3489,98 @@ Prefab:
m_ParentPrefab
:
{
fileID
:
0
}
m_ParentPrefab
:
{
fileID
:
0
}
m_RootGameObject
:
{
fileID
:
115020
}
m_RootGameObject
:
{
fileID
:
115020
}
m_IsPrefabParent
:
1
m_IsPrefabParent
:
1
---
!u!1
&1580018882127394
GameObject
:
m_ObjectHideFlags
:
1
m_PrefabParentObject
:
{
fileID
:
0
}
m_PrefabInternal
:
{
fileID
:
100100000
}
serializedVersion
:
5
m_Component
:
-
component
:
{
fileID
:
4620669052562040
}
-
component
:
{
fileID
:
114157960367862120
}
m_Layer
:
18
m_Name
:
'
!lable'
m_TagString
:
Untagged
m_Icon
:
{
fileID
:
0
}
m_NavMeshLayer
:
0
m_StaticEditorFlags
:
0
m_IsActive
:
1
---
!u!4
&4620669052562040
Transform
:
m_ObjectHideFlags
:
1
m_PrefabParentObject
:
{
fileID
:
0
}
m_PrefabInternal
:
{
fileID
:
100100000
}
m_GameObject
:
{
fileID
:
1580018882127394
}
m_LocalRotation
:
{
x
:
0
,
y
:
0
,
z
:
0
,
w
:
1
}
m_LocalPosition
:
{
x
:
-35
,
y
:
0
,
z
:
0
}
m_LocalScale
:
{
x
:
1
,
y
:
1
,
z
:
1
}
m_Children
:
[]
m_Father
:
{
fileID
:
472854
}
m_RootOrder
:
0
m_LocalEulerAnglesHint
:
{
x
:
0
,
y
:
0
,
z
:
0
}
---
!u!114
&114157960367862120
MonoBehaviour
:
m_ObjectHideFlags
:
1
m_PrefabParentObject
:
{
fileID
:
0
}
m_PrefabInternal
:
{
fileID
:
100100000
}
m_GameObject
:
{
fileID
:
1580018882127394
}
m_Enabled
:
1
m_EditorHideFlags
:
0
m_Script
:
{
fileID
:
11500000
,
guid
:
e9d0b5f3bbe925a408bd595c79d0bf63
,
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
:
1
}
mPivot
:
4
mWidth
:
120
mHeight
:
26
mDepth
:
25
autoResizeBoxCollider
:
0
hideIfOffScreen
:
0
keepAspectRatio
:
0
aspectRatio
:
4.6153846
keepCrispWhenShrunk
:
1
mTrueTypeFont
:
{
fileID
:
12800000
,
guid
:
f775853fdfd14bb47934543e95c3bae3
,
type
:
3
}
mFont
:
{
fileID
:
0
}
mText
:
"
\u4E3B\u673A\u5730\u5740\uFF1A
"
mFontSize
:
22
mFontStyle
:
0
mAlignment
:
3
mEncoding
:
1
mMaxLineCount
:
0
mEffectStyle
:
1
mEffectColor
:
{
r
:
0
,
g
:
0
,
b
:
0
,
a
:
1
}
mSymbols
:
1
mEffectDistance
:
{
x
:
1
,
y
:
1
}
mOverflow
:
0
mMaterial
:
{
fileID
:
0
}
mApplyGradient
:
0
mGradientTop
:
{
r
:
1
,
g
:
1
,
b
:
1
,
a
:
1
}
mGradientBottom
:
{
r
:
0.7
,
g
:
0.7
,
b
:
0.7
,
a
:
1
}
mSpacingX
:
0
mSpacingY
:
0
mUseFloatSpacing
:
0
mFloatSpacingX
:
0
mFloatSpacingY
:
0
mOverflowEllipsis
:
0
mShrinkToFit
:
0
mMaxLineWidth
:
0
mMaxLineHeight
:
0
mLineWidth
:
0
mMultiline
:
1
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