Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.

Commit 2718b9f

Browse files
BGanadeBGanade
committed
Merge branch 'main' of https://github.com/coetus-jd/unity-pirateCave into main
2 parents 2430ffa + 8609db0 commit 2718b9f

File tree

6 files changed

+52
-11
lines changed

6 files changed

+52
-11
lines changed

Diff for: ‎Assets/Palettes/Images/Corsair/Scenario/PieceOf8.meta

+8
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: ‎Assets/Palettes/Images/Corsair/Scenario/Trunk.meta

+8
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: ‎Assets/Scenes/Account/Register.unity

+16-1
Original file line numberDiff line numberDiff line change
@@ -229,7 +229,7 @@ MonoBehaviour:
229229
error: {fileID: 21300000, guid: a174486fd73a2b245adfb739a9a34355, type: 3}
230230
inputNick: {fileID: 1170873088}
231231
inputName: {fileID: 894841250}
232-
buttonRegister: {fileID: 0}
232+
buttonRegister: {fileID: 219087789}
233233
--- !u!4 &13032034
234234
Transform:
235235
m_ObjectHideFlags: 0
@@ -1044,6 +1044,21 @@ PrefabInstance:
10441044
propertyPath: m_Navigation.m_SelectOnDown
10451045
value:
10461046
objectReference: {fileID: 660681521}
1047+
- target: {fileID: 3016667657726181189, guid: ba1607884fe19c74c8fa43678796de70,
1048+
type: 3}
1049+
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target
1050+
value:
1051+
objectReference: {fileID: 13032033}
1052+
- target: {fileID: 3016667657726181189, guid: ba1607884fe19c74c8fa43678796de70,
1053+
type: 3}
1054+
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName
1055+
value: register
1056+
objectReference: {fileID: 0}
1057+
- target: {fileID: 3016667657726181189, guid: ba1607884fe19c74c8fa43678796de70,
1058+
type: 3}
1059+
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Mode
1060+
value: 1
1061+
objectReference: {fileID: 0}
10471062
- target: {fileID: 3016667657726181194, guid: ba1607884fe19c74c8fa43678796de70,
10481063
type: 3}
10491064
propertyPath: m_LocalPosition.x

Diff for: ‎Assets/Scenes/Account/Update.unity

+8-3
Original file line numberDiff line numberDiff line change
@@ -229,7 +229,7 @@ MonoBehaviour:
229229
error: {fileID: 21300000, guid: a174486fd73a2b245adfb739a9a34355, type: 3}
230230
inputNick: {fileID: 1170873088}
231231
inputName: {fileID: 894841250}
232-
buttonUpdate: {fileID: 0}
232+
buttonUpdate: {fileID: 142404848}
233233
--- !u!4 &13032034
234234
Transform:
235235
m_ObjectHideFlags: 0
@@ -2264,11 +2264,16 @@ PrefabInstance:
22642264
type: 3}
22652265
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target
22662266
value:
2267-
objectReference: {fileID: 810649774}
2267+
objectReference: {fileID: 13032033}
22682268
- target: {fileID: 3016667657726181189, guid: ba1607884fe19c74c8fa43678796de70,
22692269
type: 3}
22702270
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName
2271-
value: LoadLevel
2271+
value: update
2272+
objectReference: {fileID: 0}
2273+
- target: {fileID: 3016667657726181189, guid: ba1607884fe19c74c8fa43678796de70,
2274+
type: 3}
2275+
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Mode
2276+
value: 1
22722277
objectReference: {fileID: 0}
22732278
- target: {fileID: 3016667657726181194, guid: ba1607884fe19c74c8fa43678796de70,
22742279
type: 3}

Diff for: ‎Assets/Scenes/Login.unity

+8-3
Original file line numberDiff line numberDiff line change
@@ -228,7 +228,7 @@ MonoBehaviour:
228228
success: {fileID: 21300000, guid: 63a5c72c7d29b2f459017a850f93ebdc, type: 3}
229229
error: {fileID: 21300000, guid: a174486fd73a2b245adfb739a9a34355, type: 3}
230230
inputNick: {fileID: 1170873090}
231-
buttonLogin: {fileID: 0}
231+
buttonLogin: {fileID: 2025552406}
232232
--- !u!4 &13032034
233233
Transform:
234234
m_ObjectHideFlags: 0
@@ -1852,11 +1852,16 @@ PrefabInstance:
18521852
type: 3}
18531853
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target
18541854
value:
1855-
objectReference: {fileID: 284481860}
1855+
objectReference: {fileID: 13032033}
18561856
- target: {fileID: 3016667657726181189, guid: ba1607884fe19c74c8fa43678796de70,
18571857
type: 3}
18581858
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName
1859-
value: LoadLevel
1859+
value: login
1860+
objectReference: {fileID: 0}
1861+
- target: {fileID: 3016667657726181189, guid: ba1607884fe19c74c8fa43678796de70,
1862+
type: 3}
1863+
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_StringArgument
1864+
value:
18601865
objectReference: {fileID: 0}
18611866
- target: {fileID: 3016667657726181194, guid: ba1607884fe19c74c8fa43678796de70,
18621867
type: 3}

Diff for: ‎Assets/Scenes/Phase.unity

+4-4
Original file line numberDiff line numberDiff line change
@@ -4403,7 +4403,7 @@ Transform:
44034403
m_PrefabAsset: {fileID: 0}
44044404
m_GameObject: {fileID: 611071242}
44054405
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
4406-
m_LocalPosition: {x: 514.06, y: -22.730001, z: -4}
4406+
m_LocalPosition: {x: -35.531433, y: 4.5397706, z: -4}
44074407
m_LocalScale: {x: 1, y: 1, z: 1}
44084408
m_Children: []
44094409
m_Father: {fileID: 0}
@@ -103496,7 +103496,7 @@ Transform:
103496103496
m_PrefabAsset: {fileID: 0}
103497103497
m_GameObject: {fileID: 1124967963}
103498103498
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
103499-
m_LocalPosition: {x: 514.06, y: -22.730001, z: -4}
103499+
m_LocalPosition: {x: -45.94, y: 4.5699987, z: -4}
103500103500
m_LocalScale: {x: 1, y: 1, z: 1}
103501103501
m_Children:
103502103502
- {fileID: 1100553608}
@@ -127284,12 +127284,12 @@ PrefabInstance:
127284127284
- target: {fileID: 6637404424377639631, guid: 27450c76bf0eb3b459bc8bfdf8051590,
127285127285
type: 3}
127286127286
propertyPath: m_LocalPosition.x
127287-
value: 514
127287+
value: -46
127288127288
objectReference: {fileID: 0}
127289127289
- target: {fileID: 6637404424377639631, guid: 27450c76bf0eb3b459bc8bfdf8051590,
127290127290
type: 3}
127291127291
propertyPath: m_LocalPosition.y
127292-
value: -23.3
127292+
value: 4
127293127293
objectReference: {fileID: 0}
127294127294
- target: {fileID: 6637404424377639631, guid: 27450c76bf0eb3b459bc8bfdf8051590,
127295127295
type: 3}

0 commit comments

Comments
 (0)