Update voting & job selection systems

- voting now fully cancels and clears when atleast one player cancels or closes the voting UI
- when selecting a job and voting, the zone is stored on all players, allowing to load different zones / jobs
This commit is contained in:
Pedro Gomes 2024-07-24 22:36:36 +01:00
parent bc4019ffdf
commit 6e232f4276
37 changed files with 2284 additions and 1031 deletions

View File

@ -1455,9 +1455,11 @@ MonoBehaviour:
reputationReward: {fileID: 5718412988911981123} reputationReward: {fileID: 5718412988911981123}
infoPanel: {fileID: 2113646716517166967} infoPanel: {fileID: 2113646716517166967}
closeButton: {fileID: 7127167279720441944} closeButton: {fileID: 7127167279720441944}
onInfoPanelClosed: {fileID: 11400000, guid: 36115439be010a64c9d01937a7495bf0, type: 2}
onJobSelected: {fileID: 7548970992762845130} onJobSelected: {fileID: 7548970992762845130}
onJobsBoardReleased: {fileID: 7747745374986686275} onJobsBoardReleased: {fileID: 7747745374986686275}
onPlayerVoted: {fileID: 6230316876783271557} onPlayerVoted: {fileID: 6230316876783271557}
onGameOptionsOpenned: {fileID: 7748632495485306274}
--- !u!1 &3314796913785348967 --- !u!1 &3314796913785348967
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -3041,9 +3043,14 @@ MonoBehaviour:
- {fileID: 11400000, guid: d4b6c474cf532d549b6e0112aa200480, type: 2} - {fileID: 11400000, guid: d4b6c474cf532d549b6e0112aa200480, type: 2}
- {fileID: 11400000, guid: eefc0393a544d8847a0fea9a0258e4f0, type: 2} - {fileID: 11400000, guid: eefc0393a544d8847a0fea9a0258e4f0, type: 2}
- {fileID: 11400000, guid: d43b12ef451b17744b8bf8e16c94efee, type: 2} - {fileID: 11400000, guid: d43b12ef451b17744b8bf8e16c94efee, type: 2}
- {fileID: 11400000, guid: 4f43a4ef29a644c48a286e6d5e989726, type: 2}
- {fileID: 11400000, guid: 7c03970b834a755499af5edb80876b0a, type: 2}
- {fileID: 11400000, guid: 49617cb35937e1f4b8120459b2b1f3b6, type: 2}
- {fileID: 11400000, guid: cc8eace2a6aae044692d272eac5492eb, type: 2}
zones: zones:
- {fileID: 11400000, guid: e36ea6b9660389f45a604d7075de7d4b, type: 2} - {fileID: 11400000, guid: e36ea6b9660389f45a604d7075de7d4b, type: 2}
- {fileID: 11400000, guid: 5b6467b6a4765974a8a36e80982c566e, type: 2} - {fileID: 11400000, guid: 5b6467b6a4765974a8a36e80982c566e, type: 2}
- {fileID: 11400000, guid: c9e3493130481e84e926fcce855a1ecb, type: 2}
onAvailableJobsUpdated: {fileID: 11400000, guid: 0c14e2435e97e9547a7d17a1307e9b82, type: 2} onAvailableJobsUpdated: {fileID: 11400000, guid: 0c14e2435e97e9547a7d17a1307e9b82, type: 2}
onJobStarted: {fileID: 11400000, guid: 877ad14a5812da542804e4bac39767fe, type: 2} onJobStarted: {fileID: 11400000, guid: 877ad14a5812da542804e4bac39767fe, type: 2}
onJobCompleted: {fileID: 11400000, guid: ddfb03fbf14af514db49b94a6c884fe1, type: 2} onJobCompleted: {fileID: 11400000, guid: ddfb03fbf14af514db49b94a6c884fe1, type: 2}
@ -3081,6 +3088,54 @@ MonoBehaviour:
experienceReward: 0 experienceReward: 0
reputationReward: 0 reputationReward: 0
completed: 0 completed: 0
--- !u!1 &7176475205770385427
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 2106073402439723455}
- component: {fileID: 264528096295869824}
m_Layer: 0
m_Name: OnJobInfoPanelClosed
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &2106073402439723455
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7176475205770385427}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 7475116341208250298}
m_RootOrder: 15
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &264528096295869824
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7176475205770385427}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: b18d3d5defd7c6845a22a1583a92bfb1, type: 3}
m_Name:
m_EditorClassIdentifier:
Event: {fileID: 11400000, guid: 36115439be010a64c9d01937a7495bf0, type: 2}
Response:
m_PersistentCalls:
m_Calls: []
--- !u!1 &7218269876443849481 --- !u!1 &7218269876443849481
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -3647,6 +3702,9 @@ MonoBehaviour:
- {fileID: 11400000, guid: 6cf7c174663354f4bb94833236e61c18, type: 2} - {fileID: 11400000, guid: 6cf7c174663354f4bb94833236e61c18, type: 2}
- {fileID: 11400000, guid: 0db150a6bbd0c1d478dbd3fc09a6ef85, type: 2} - {fileID: 11400000, guid: 0db150a6bbd0c1d478dbd3fc09a6ef85, type: 2}
- {fileID: 11400000, guid: f0272d37cc7635f4cbdfb40b1a16a9e7, type: 2} - {fileID: 11400000, guid: f0272d37cc7635f4cbdfb40b1a16a9e7, type: 2}
- {fileID: 11400000, guid: 8cf6b9de105ab0f4a9440080ab24b434, type: 2}
- {fileID: 11400000, guid: 5460bd9c449821d49bd19080e88a8f9e, type: 2}
- {fileID: 11400000, guid: 50fe026b53483dd4fa08679bd24bb4b9, type: 2}
--- !u!1 &7475116341184709871 --- !u!1 &7475116341184709871
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -3752,6 +3810,7 @@ Transform:
- {fileID: 3508443704625304382} - {fileID: 3508443704625304382}
- {fileID: 6038671798495682422} - {fileID: 6038671798495682422}
- {fileID: 7303580844555814141} - {fileID: 7303580844555814141}
- {fileID: 2106073402439723455}
m_Father: {fileID: 7475116342638198534} m_Father: {fileID: 7475116342638198534}
m_RootOrder: 17 m_RootOrder: 17
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -5283,7 +5342,9 @@ MonoBehaviour:
onLoadLevelStarting: {fileID: 11400000, guid: c86d4c85a149f9648adda7cdcbdefbd9, type: 2} onLoadLevelStarting: {fileID: 11400000, guid: c86d4c85a149f9648adda7cdcbdefbd9, type: 2}
onJoinedRoom: {fileID: 11400000, guid: f1a37dbd6b4904a4f9d9834d72d99370, type: 2} onJoinedRoom: {fileID: 11400000, guid: f1a37dbd6b4904a4f9d9834d72d99370, type: 2}
onGameSceneLoaded: {fileID: 1384308382823606702} onGameSceneLoaded: {fileID: 1384308382823606702}
onJobSelected: {fileID: 7548970992762845130}
onPlayerSpawned: {fileID: 7475116342871483259} onPlayerSpawned: {fileID: 7475116342871483259}
onInfoPanelClosed: {fileID: 264528096295869824}
changeLevelVoteText: {fileID: 5087666242074858168} changeLevelVoteText: {fileID: 5087666242074858168}
--- !u!1 &7475116342792086823 --- !u!1 &7475116342792086823
GameObject: GameObject:
@ -8060,6 +8121,10 @@ PrefabInstance:
propertyPath: m_AnchoredPosition.y propertyPath: m_AnchoredPosition.y
value: 0 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 1962824482052217376, guid: a192502938b6c6e40b392778d5967de0, type: 3}
propertyPath: m_Name
value: Dayard-Button
objectReference: {fileID: 0}
- target: {fileID: 2645751941834462026, guid: a192502938b6c6e40b392778d5967de0, type: 3} - target: {fileID: 2645751941834462026, guid: a192502938b6c6e40b392778d5967de0, type: 3}
propertyPath: m_text propertyPath: m_text
value: Claim Bonus value: Claim Bonus
@ -8180,6 +8245,10 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z propertyPath: m_LocalEulerAnglesHint.z
value: 0 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 5924497174373827973, guid: a192502938b6c6e40b392778d5967de0, type: 3}
propertyPath: m_Name
value: Button (0)
objectReference: {fileID: 0}
- target: {fileID: 6183013855683199780, guid: a192502938b6c6e40b392778d5967de0, type: 3} - target: {fileID: 6183013855683199780, guid: a192502938b6c6e40b392778d5967de0, type: 3}
propertyPath: m_AnchorMax.y propertyPath: m_AnchorMax.y
value: 0 value: 0
@ -8204,6 +8273,10 @@ PrefabInstance:
propertyPath: m_AnchoredPosition.y propertyPath: m_AnchoredPosition.y
value: 0 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 7623725364961434152, guid: a192502938b6c6e40b392778d5967de0, type: 3}
propertyPath: zoneData
value:
objectReference: {fileID: 11400000, guid: c9e3493130481e84e926fcce855a1ecb, type: 2}
- target: {fileID: 7623725365000496500, guid: a192502938b6c6e40b392778d5967de0, type: 3} - target: {fileID: 7623725365000496500, guid: a192502938b6c6e40b392778d5967de0, type: 3}
propertyPath: jobData.jobDescription propertyPath: jobData.jobDescription
value: value:

View File

@ -38,7 +38,7 @@ RenderSettings:
m_ReflectionIntensity: 1 m_ReflectionIntensity: 1
m_CustomReflection: {fileID: 0} m_CustomReflection: {fileID: 0}
m_Sun: {fileID: 0} m_Sun: {fileID: 0}
m_IndirectSpecularColor: {r: 0.06381169, g: 0.12767169, b: 0.13333194, a: 1} m_IndirectSpecularColor: {r: 0.061713897, g: 0.123470515, b: 0.12890881, a: 1}
m_UseRadianceAmbientProbe: 0 m_UseRadianceAmbientProbe: 0
--- !u!157 &3 --- !u!157 &3
LightmapSettings: LightmapSettings:
@ -1321,38 +1321,6 @@ PrefabInstance:
m_Modification: m_Modification:
m_TransformParent: {fileID: 0} m_TransformParent: {fileID: 0}
m_Modifications: m_Modifications:
- target: {fileID: 1937322274624059534, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1937322274624059534, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1937322274624059534, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1937322274624059534, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2363082734463220811, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2363082734463220811, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2363082734463220811, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2363082734463220811, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3572373654598039533, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3} - target: {fileID: 3572373654598039533, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3}
propertyPath: m_AnchorMax.y propertyPath: m_AnchorMax.y
value: 0 value: 0
@ -1401,22 +1369,6 @@ PrefabInstance:
propertyPath: m_AnchoredPosition.y propertyPath: m_AnchoredPosition.y
value: 0 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 3818900776374735421, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3818900776374735421, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3818900776374735421, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3818900776374735421, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4759723387849467176, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3} - target: {fileID: 4759723387849467176, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3}
propertyPath: m_AnchorMax.y propertyPath: m_AnchorMax.y
value: 0 value: 0
@ -1465,318 +1417,6 @@ PrefabInstance:
propertyPath: m_AnchoredPosition.y propertyPath: m_AnchoredPosition.y
value: 0 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 6134643950268578271, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6134643950268578271, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6134643950268578271, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6134643950268578271, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6134643950268578271, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6134643950268578271, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6134643950640157397, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6134643950640157397, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6134643950640157397, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6134643950640157397, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6134643950640157397, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6134643950640157397, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6134643950866280464, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6134643950866280464, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6134643950866280464, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6134643950866280464, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6134643950866280464, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6134643950866280464, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6134643951109548461, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6134643951109548461, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6134643951109548461, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6134643951109548461, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6134643951109548461, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6134643951109548461, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6134643951284417893, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6134643951284417893, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6134643951284417893, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6134643951284417893, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6134643951284417893, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6134643951284417893, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6134643951407787384, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6134643951407787384, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6134643951407787384, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6134643951407787384, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6134643951407787384, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6134643951407787384, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6134643951884640313, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6134643951884640313, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6134643951884640313, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6134643951884640313, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6134643951884640313, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6134643951884640313, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6134643951901827828, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6134643951901827828, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6134643951901827828, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6134643951901827828, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6134643951901827828, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6134643951901827828, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6134643952195008083, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6134643952195008083, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6134643952195008083, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6134643952195008083, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6134643952195008083, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6134643952195008083, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6134643952287903420, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6134643952287903420, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6134643952287903420, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6134643952287903420, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6134643952287903420, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6134643952287903420, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6171305395222225369, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6171305395222225369, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6171305395222225369, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6171305395222225369, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6486262286580599512, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6486262286580599512, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6486262286580599512, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6486262286580599512, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6913262005630981626, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6913262005630981626, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6913262005630981626, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6913262005630981626, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7050030135821061135, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7050030135821061135, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7050030135821061135, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3}
propertyPath: m_SizeDelta.x
value: 120
objectReference: {fileID: 0}
- target: {fileID: 7050030135821061135, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3}
propertyPath: m_SizeDelta.y
value: 120
objectReference: {fileID: 0}
- target: {fileID: 7050030135821061135, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7050030135821061135, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7227319219501551729, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3} - target: {fileID: 7227319219501551729, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3}
propertyPath: m_AnchorMax.y propertyPath: m_AnchorMax.y
value: 0 value: 0
@ -2045,110 +1685,6 @@ PrefabInstance:
propertyPath: m_SizeDelta.y propertyPath: m_SizeDelta.y
value: 0 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 7475116342305655975, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7475116342305655975, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7475116342305655975, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7475116342305655975, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7475116342305655975, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7475116342305655975, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7475116342305660313, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7475116342305660313, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7475116342305665201, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7475116342305665201, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7475116342305665201, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7475116342305665201, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7475116342305665201, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7475116342305665201, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7475116342305758377, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7475116342305758377, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7475116342305758377, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7475116342305758377, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7475116342305758377, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7475116342305758377, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7475116342305768383, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7475116342305768383, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7475116342305768383, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7475116342305768383, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7475116342305768383, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7475116342305768383, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7475116342305770233, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3} - target: {fileID: 7475116342305770233, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3}
propertyPath: m_AnchorMax.y propertyPath: m_AnchorMax.y
value: 0 value: 0
@ -2173,78 +1709,6 @@ PrefabInstance:
propertyPath: m_AnchoredPosition.y propertyPath: m_AnchoredPosition.y
value: 0 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 7475116342305773047, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7475116342305773047, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7475116342305773047, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7475116342305773047, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7475116342305773047, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7475116342305773047, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7475116342305773585, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7475116342305773585, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7475116342305773585, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7475116342305773585, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7475116342305773585, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7475116342305773585, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7475116342305774289, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7475116342305774289, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7475116342305774289, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7475116342305774289, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7475116342305774289, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7475116342305774289, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7475116342305783261, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3} - target: {fileID: 7475116342305783261, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3}
propertyPath: m_AnchorMax.y propertyPath: m_AnchorMax.y
value: 0 value: 0
@ -2269,110 +1733,6 @@ PrefabInstance:
propertyPath: m_AnchoredPosition.y propertyPath: m_AnchoredPosition.y
value: 0 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 7475116342305819235, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7475116342305819235, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7475116342305819235, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7475116342305819235, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7475116342305819235, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7475116342305819235, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7475116342305824339, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7475116342305824339, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7475116342305824339, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7475116342305824339, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7475116342305824339, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7475116342305824339, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7475116342305825505, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7475116342305825505, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7475116342305825505, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7475116342305825505, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7475116342305825505, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7475116342305825505, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7475116342305830465, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7475116342305830465, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7475116342305830465, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7475116342305830465, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7475116342305830465, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7475116342305830465, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7475116342305831057, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7475116342305831057, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7475116342305832019, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3} - target: {fileID: 7475116342305832019, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3}
propertyPath: m_AnchorMax.y propertyPath: m_AnchorMax.y
value: 0 value: 0
@ -2397,182 +1757,6 @@ PrefabInstance:
propertyPath: m_AnchoredPosition.y propertyPath: m_AnchoredPosition.y
value: 0 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 7475116342305833455, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7475116342305833455, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7475116342305833455, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7475116342305833455, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7475116342305833455, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7475116342305833455, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7475116342305854767, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7475116342305854767, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7475116342305854767, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7475116342305854767, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7475116342305854767, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7475116342305854767, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7475116342305856963, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7475116342305856963, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7475116342305862233, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7475116342305862233, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7475116342305862233, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7475116342305862233, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7475116342305862233, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7475116342305862233, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7475116342305863519, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7475116342305863519, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7475116342305863519, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7475116342305863519, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7475116342305863519, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7475116342305863519, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7475116342305864677, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7475116342305864677, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7475116342305864677, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7475116342305864677, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7475116342305864677, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7475116342305864677, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7475116342305877679, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7475116342305877679, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7475116342305877679, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7475116342305877679, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7475116342305877679, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7475116342305877679, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7475116342305878647, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7475116342305878647, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7475116342305878647, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7475116342305878647, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7475116342305878647, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7475116342305878647, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7840512114539168951, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3} - target: {fileID: 7840512114539168951, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3}
propertyPath: m_AnchorMax.y propertyPath: m_AnchorMax.y
value: 0 value: 0
@ -2617,38 +1801,6 @@ PrefabInstance:
propertyPath: m_AnchoredPosition.y propertyPath: m_AnchoredPosition.y
value: 0 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 8605670301635831021, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8605670301635831021, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8605670301635831021, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8605670301635831021, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8955363189425139936, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8955363189425139936, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8955363189425139936, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8955363189425139936, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 9019508352508791564, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3} - target: {fileID: 9019508352508791564, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3}
propertyPath: m_AnchorMax.y propertyPath: m_AnchorMax.y
value: 0 value: 0

1734
Assets/Scenes/4-Dayard.unity Normal file

File diff suppressed because it is too large Load Diff

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 5f7e6d9b6398b934cb82815de4a7af62
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,18 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: b9908b624f60dcb46ada9e448848a62a, type: 3}
m_Name: Dayard
m_EditorClassIdentifier:
zoneName: Dayard
levelName: 4-Dayard
isHostileZone: 1
spawnPoints: []

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: c9e3493130481e84e926fcce855a1ecb
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: f5dd73a6ded36854d9d252f896994983
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,38 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: af4d16026a0a933489be6df5f94e90aa, type: 3}
m_Name: DaynvasionCleanupCrew_Template_01
m_EditorClassIdentifier:
title: Skelly'nvasion Cleanup Crew
description: 'Location: The Dayard (Graveyard)
Mission Brief:
Attention,
Rift Hunters!The Dayard, once a serene resting place, has been overrun by a menacing
horde of skeletons - the dreaded Skelly''nvasion! As a member of the Cleanup
Crew, your mission is to venture into the heart of the Skellyard and purge it
of these skeletal invaders.'
showJobTitlePrefix: 1
zoneName: Dayard
levelName: 4-Dayard
isHostileZone: 1
baseCoinReward: 50
baseExperienceFinalReward: 200
baseReputationFinalReward: 1
percentCoinReward: 0.5
percentExperienceFinalReward: 0.5
percentReputationFinalReward: 0.2

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 4f43a4ef29a644c48a286e6d5e989726
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,39 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: af4d16026a0a933489be6df5f94e90aa, type: 3}
m_Name: DaynvasionCleanupCrew_Template_02
m_EditorClassIdentifier:
title: Skelly'nvasion Cleanup Crew
description: 'Location: The Dayard (Graveyard)
(GOLDEN)
Mission Brief:
Attention,
Rift Hunters!The Dayard, once a serene resting place, has been overrun by a menacing
horde of skeletons - the dreaded Skelly''nvasion! As a member of the Cleanup
Crew, your mission is to venture into the heart of the Dayard and purge it of
these skeletal invaders.'
showJobTitlePrefix: 1
zoneName: Dayard
levelName: 4-Dayard
isHostileZone: 1
baseCoinReward: 500
baseExperienceFinalReward: 200
baseReputationFinalReward: 1
percentCoinReward: 0.75
percentExperienceFinalReward: 0.5
percentReputationFinalReward: 0.2

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 7c03970b834a755499af5edb80876b0a
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,39 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: af4d16026a0a933489be6df5f94e90aa, type: 3}
m_Name: DaynvasionCleanupCrew_Template_03
m_EditorClassIdentifier:
title: Skelly'nvasion Cleanup Crew
description: 'Location: The Dayard (Graveyard)
(REPUTABLE)
Mission Brief:
Attention,
Rift Hunters!The Dayard, once a serene resting place, has been overrun by a menacing
horde of skeletons - the dreaded Skelly''nvasion! As a member of the Cleanup
Crew, your mission is to venture into the heart of the Dayard and purge it of
these skeletal invaders.'
showJobTitlePrefix: 1
zoneName: Dayard
levelName: 4-Dayard
isHostileZone: 1
baseCoinReward: 50
baseExperienceFinalReward: 200
baseReputationFinalReward: 5
percentCoinReward: 0.5
percentExperienceFinalReward: 0.5
percentReputationFinalReward: 0.2

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 49617cb35937e1f4b8120459b2b1f3b6
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,39 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: af4d16026a0a933489be6df5f94e90aa, type: 3}
m_Name: DaynvasionCleanupCrew_Template_04
m_EditorClassIdentifier:
title: Skelly'nvasion Cleanup Crew
description: 'Location: The Dayard (Graveyard)
(EXPERIENCED)
Mission
Brief:
Attention, Rift Hunters!The Dayard, once a serene resting place,
has been overrun by a menacing horde of skeletons - the dreaded Skelly''nvasion!
As a member of the Cleanup Crew, your mission is to venture into the heart of
the Dayard and purge it of these skeletal invaders.'
showJobTitlePrefix: 1
zoneName: Dayard
levelName: 4-Dayard
isHostileZone: 1
baseCoinReward: 50
baseExperienceFinalReward: 1000
baseReputationFinalReward: 1
percentCoinReward: 0.5
percentExperienceFinalReward: 0.5
percentReputationFinalReward: 0.2

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: cc8eace2a6aae044692d272eac5492eb
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 452d34815dabbb3418c5847670a17195
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,14 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 83fe5321976e21d4b96c6d7182a5b8e2, type: 3}
m_Name: OnJobInfoPanelClosed
m_EditorClassIdentifier:

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 36115439be010a64c9d01937a7495bf0
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
userData:
assetBundleName:
assetBundleVariant:

View File

@ -107,4 +107,24 @@ public static class GameConstants
public static int TotalInventorySlots = 18; public static int TotalInventorySlots = 18;
} }
public static class Scenes
{
public static string HuntersInn = "4-RiftHuntersInn";
public static string Skellyard = "4-Skellyard";
public static string Dayard = "4-Dayard";
public static string GetSceneNameByZoneName(string zoneName)
{
zoneName = zoneName.ToLower();
if (zoneName.Contains("huntersinn"))
return HuntersInn;
if (zoneName.Contains("skellyard"))
return Skellyard;
if (zoneName.Contains("dayard"))
return Dayard;
return HuntersInn;
}
}
} }

View File

@ -23,7 +23,9 @@ public class NetworkManager : MonoBehaviourPunCallbacks, IOnEventCallback
[SerializeField] private GameEvent onJoinedRoom; [SerializeField] private GameEvent onJoinedRoom;
[SerializeField] private GameEventListener_ZoneData onGameSceneLoaded; [SerializeField] private GameEventListener_ZoneData onGameSceneLoaded;
[SerializeField] private GameEventListener_JobInstance onJobSelected;
[SerializeField] private GameEventListener_PhotonView onPlayerSpawned; [SerializeField] private GameEventListener_PhotonView onPlayerSpawned;
[SerializeField] private GameEventListener onInfoPanelClosed;
[SerializeField] private TMP_Text changeLevelVoteText; [SerializeField] private TMP_Text changeLevelVoteText;
@ -38,9 +40,8 @@ public class NetworkManager : MonoBehaviourPunCallbacks, IOnEventCallback
public List<Player> party = new List<Player>(); public List<Player> party = new List<Player>();
readonly string huntersInn = "4-RiftHuntersInn";
readonly string skellyard = "4-Skellyard";
private string votedZone;
private void Awake() private void Awake()
@ -49,6 +50,11 @@ public class NetworkManager : MonoBehaviourPunCallbacks, IOnEventCallback
onGameSceneLoaded.Response.AddListener(OnGameSceneLoaded); onGameSceneLoaded.Response.AddListener(OnGameSceneLoaded);
onPlayerSpawned.Response.AddListener(OnPlayerSpawned); onPlayerSpawned.Response.AddListener(OnPlayerSpawned);
onInfoPanelClosed.Response.AddListener(() =>
{
CancelChangeLevelVote();
});
onJobSelected.Response.AddListener((x) => votedZone = x.zoneName);
} }
// Start is called before the first frame update // Start is called before the first frame update
@ -79,11 +85,11 @@ public class NetworkManager : MonoBehaviourPunCallbacks, IOnEventCallback
ClearVotes(); ClearVotes();
if (!SceneManager.GetActiveScene().name.Contains(huntersInn)) if (!SceneManager.GetActiveScene().name.Contains(GameConstants.Scenes.HuntersInn))
{ {
if (PhotonNetwork.IsMasterClient) if (PhotonNetwork.IsMasterClient)
{ {
PhotonNetwork.LoadLevel(huntersInn); PhotonNetwork.LoadLevel(GameConstants.Scenes.HuntersInn);
} }
} }
@ -190,6 +196,7 @@ public class NetworkManager : MonoBehaviourPunCallbacks, IOnEventCallback
if (changeLevelVoted) return; if (changeLevelVoted) return;
voteButton = button; voteButton = button;
changeLevelVoted = true; changeLevelVoted = true;
voteButton.interactable = false; voteButton.interactable = false;
if (PhotonNetwork.CurrentRoom.PlayerCount == 1) if (PhotonNetwork.CurrentRoom.PlayerCount == 1)
@ -201,7 +208,13 @@ public class NetworkManager : MonoBehaviourPunCallbacks, IOnEventCallback
{ {
CountVote(PhotonNetwork.LocalPlayer); CountVote(PhotonNetwork.LocalPlayer);
RaiseEventOptions raiseEventOptions = new RaiseEventOptions { Receivers = ReceiverGroup.Others }; RaiseEventOptions raiseEventOptions = new RaiseEventOptions { Receivers = ReceiverGroup.Others };
PhotonNetwork.RaiseEvent(GameConstants.NetworkEventCodes.ChangeLevelVoted, PhotonNetwork.LocalPlayer, raiseEventOptions, SendOptions.SendReliable); object[] content = new object[]
{
PhotonNetwork.LocalPlayer,
votedZone
};
PhotonNetwork.RaiseEvent(GameConstants.NetworkEventCodes.ChangeLevelVoted, content, raiseEventOptions, SendOptions.SendReliable);
if (PhotonNetwork.IsMasterClient) if (PhotonNetwork.IsMasterClient)
{ {
if (count >= PhotonNetwork.CurrentRoom.PlayerCount) if (count >= PhotonNetwork.CurrentRoom.PlayerCount)
@ -215,13 +228,13 @@ public class NetworkManager : MonoBehaviourPunCallbacks, IOnEventCallback
public void CancelChangeLevelVote() public void CancelChangeLevelVote()
{ {
if (!PhotonNetwork.IsConnected) return; if (!PhotonNetwork.IsConnected) return;
if (!changeLevelVoted) return;
changeLevelVoted = false; changeLevelVoted = false;
if (voteButton != null) if (voteButton != null)
voteButton.interactable = true; voteButton.interactable = true;
RemoveVote(PhotonNetwork.LocalPlayer); RemoveVote(PhotonNetwork.LocalPlayer);
ClearVotes();
RaiseEventOptions raiseEventOptions = new RaiseEventOptions { Receivers = ReceiverGroup.Others }; RaiseEventOptions raiseEventOptions = new RaiseEventOptions { Receivers = ReceiverGroup.Others };
PhotonNetwork.RaiseEvent(GameConstants.NetworkEventCodes.CancelChangeLevelVoted, PhotonNetwork.LocalPlayer, raiseEventOptions, SendOptions.SendReliable); PhotonNetwork.RaiseEvent(GameConstants.NetworkEventCodes.CancelChangeLevelVoted, PhotonNetwork.LocalPlayer, raiseEventOptions, SendOptions.SendReliable);
@ -235,9 +248,20 @@ public class NetworkManager : MonoBehaviourPunCallbacks, IOnEventCallback
public void OnEvent(EventData photonEvent) public void OnEvent(EventData photonEvent)
{ {
if (photonEvent.Code == GameConstants.NetworkEventCodes.JobSelection)
{
string jsonJobData = (string)photonEvent.CustomData;
Debug.Log("Job selected: " + jsonJobData);
JobInstance selectedJob = JsonUtility.FromJson<JobInstance>(jsonJobData);
votedZone = selectedJob.zoneName;
}
if (photonEvent.Code == GameConstants.NetworkEventCodes.ChangeLevelVoted) if (photonEvent.Code == GameConstants.NetworkEventCodes.ChangeLevelVoted)
{ {
Player player = (Player)photonEvent.CustomData; object[] content = (object[])photonEvent.CustomData;
Player player = (Player)content[0];
votedZone = (string)content[1];
Debug.Log(player); Debug.Log(player);
Debug.Log(player.ActorNumber); Debug.Log(player.ActorNumber);
Debug.Log(player.NickName); Debug.Log(player.NickName);
@ -262,6 +286,8 @@ public class NetworkManager : MonoBehaviourPunCallbacks, IOnEventCallback
Debug.Log(player.NickName); Debug.Log(player.NickName);
RemoveVote(player); RemoveVote(player);
ClearVotes();
onPlayerVoteCanceled.Raise(player);
} }
if (photonEvent.Code == GameConstants.NetworkEventCodes.LoadLevelStarting) if (photonEvent.Code == GameConstants.NetworkEventCodes.LoadLevelStarting)
{ {
@ -312,7 +338,7 @@ public class NetworkManager : MonoBehaviourPunCallbacks, IOnEventCallback
{ {
yield return new WaitForSeconds(1.5f); yield return new WaitForSeconds(1.5f);
PhotonNetwork.LoadLevel(SceneManager.GetActiveScene().name == huntersInn ? skellyard : huntersInn); PhotonNetwork.LoadLevel(GameConstants.Scenes.GetSceneNameByZoneName(votedZone));
} }
private void UpdateGameStateOnLoadLevelStarting() private void UpdateGameStateOnLoadLevelStarting()

View File

@ -0,0 +1,107 @@
using Photon.Pun;
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
public class NetworkedBaseAbility : MonoBehaviour
{
[Header("Common Settings")]
public PhotonView photonView;
public PhotonView owner;
public Taggable ownerTag;
public BaseAbility ability;
public float lifeSpan;
public bool canHitSelf;
[SerializeField] protected GameObject visuals;
[SerializeField] protected LayerMask abilityHitLayer;
protected bool waitingForDestroy = false;
protected List<Taggable> targets = new List<Taggable>();
protected PhotonView possibleTargetView;
protected Taggable possibleTarget;
protected virtual void Awake()
{
photonView = GetComponent<PhotonView>();
}
public virtual void Init()
{
if (photonView.IsMine)
{
photonView.RPC(nameof(RPC_RemoteInit), RpcTarget.Others, AbilityIndexer.Instance.Abilities.IndexOf(ability));
StartCoroutine(SelfDestruct());
}
}
[PunRPC]
protected virtual void RPC_RemoteInit(int abilityIndex)
{
ability = AbilityIndexer.Instance.Abilities[abilityIndex];
}
protected virtual IEnumerator SelfDestruct()
{
yield return new WaitForSeconds(lifeSpan);
waitingForDestroy = true;
StartCoroutine(DelayedDestroy());
}
protected virtual IEnumerator DelayedDestroy()
{
DisableVisuals();
yield return new WaitForSeconds(1.5f);
PhotonNetwork.Destroy(photonView);
}
protected virtual void DisableVisuals()
{
if (visuals != null)
{
visuals.SetActive(false);
photonView.RPC(nameof(RPC_DisableVisuals), RpcTarget.Others);
}
}
[PunRPC]
protected virtual void RPC_DisableVisuals()
{
if (visuals != null)
{
visuals.SetActive(false);
}
}
protected virtual bool IsValidTarget(Taggable target)
{
if (target == null) return false;
if (!canHitSelf && target == ownerTag) return false;
return target.IsValidTarget(ability.targettingTags);
}
protected virtual bool IsValidTarget(Collider collider)
{
possibleTargetView = collider.GetComponentInParent<PhotonView>();
if (possibleTargetView == null) return false;
if (!canHitSelf && possibleTargetView == owner) return false;
possibleTarget = possibleTargetView.GetComponent<Taggable>();
if (possibleTarget == null) return false;
if (!possibleTarget.IsValidTarget(ability.targettingTags)) return false;
return true;
}
protected virtual void ApplyEffects(List<Taggable> targets)
{
if (!photonView.IsMine) return;
foreach (BaseEffect effect in ability.abilityEffects)
{
effect.ApplyEffect(ownerTag, targets);
}
}
}

View File

@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: 0c819bade8b05d2408d7ff3d055e90b8
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -33,7 +33,7 @@ public class PartyFramesController : MonoBehaviour
onPlayerLeftParty.Response.AddListener(RemovePartyMemberFrame); onPlayerLeftParty.Response.AddListener(RemovePartyMemberFrame);
onPlayerSpawned.Response.AddListener(UpdatePartyMemberFrame); onPlayerSpawned.Response.AddListener(UpdatePartyMemberFrame);
onPlayerVoted.Response.AddListener(UpdateVoteCheckmark); onPlayerVoted.Response.AddListener(UpdateVoteCheckmark);
onPlayerVoteCanceled.Response.AddListener(CancelVoteCheckmark); onPlayerVoteCanceled.Response.AddListener((x) => CancelAllVotes());
} }
public void AddNewPartyMemberFrame(Player player) public void AddNewPartyMemberFrame(Player player)
@ -111,4 +111,13 @@ public class PartyFramesController : MonoBehaviour
partyVoteFrames[player].votedCheck.gameObject.SetActive(false); partyVoteFrames[player].votedCheck.gameObject.SetActive(false);
} }
} }
private void CancelAllVotes()
{
List<Player> keys = new List<Player>(partyVoteFrames.Keys);
for (int i = 0; i < keys.Count; i++)
{
partyVoteFrames[keys[i]].votedCheck.gameObject.SetActive(false);
}
}
} }

View File

@ -17,11 +17,14 @@ public class JobInfoPanel : MonoBehaviour, IOnEventCallback
[SerializeField] private TMP_Text reputationReward; [SerializeField] private TMP_Text reputationReward;
[SerializeField] private GameObject infoPanel; [SerializeField] private GameObject infoPanel;
[SerializeField] private Button closeButton; [SerializeField] private Button closeButton;
[Header("Events:")]
[SerializeField] private GameEvent onInfoPanelClosed;
[Header("Listeners:")] [Header("Listeners:")]
[SerializeField] private GameEventListener_JobInstance onJobSelected; [SerializeField] private GameEventListener_JobInstance onJobSelected;
[SerializeField] private GameEventListener onJobsBoardReleased; [SerializeField] private GameEventListener onJobsBoardReleased;
[SerializeField] private GameEventListener_Player onPlayerVoted; [SerializeField] private GameEventListener_Player onPlayerVoted;
[SerializeField] private GameEventListener onGameOptionsOpenned;
JobInstance networkJobInstance; JobInstance networkJobInstance;
@ -30,6 +33,7 @@ public class JobInfoPanel : MonoBehaviour, IOnEventCallback
onJobSelected.Response.AddListener((job) => SetupJobInfoPanel(job, true)); onJobSelected.Response.AddListener((job) => SetupJobInfoPanel(job, true));
onJobSelected.Response.AddListener(Send_Others_OnJobSelected); onJobSelected.Response.AddListener(Send_Others_OnJobSelected);
onJobsBoardReleased.Response.AddListener(() => ToggleInfoPanel(false)); onJobsBoardReleased.Response.AddListener(() => ToggleInfoPanel(false));
onGameOptionsOpenned.Response.AddListener(() => ToggleInfoPanel(false));
onPlayerVoted.Response.AddListener((player) => onPlayerVoted.Response.AddListener((player) =>
{ {
if (player != PhotonNetwork.LocalPlayer) if (player != PhotonNetwork.LocalPlayer)
@ -60,6 +64,8 @@ public class JobInfoPanel : MonoBehaviour, IOnEventCallback
public void ToggleInfoPanel(bool visible) public void ToggleInfoPanel(bool visible)
{ {
infoPanel.SetActive(visible); infoPanel.SetActive(visible);
if (!visible)
onInfoPanelClosed.Raise();
} }
private void Send_Others_OnJobSelected(JobInstance jobInstance) private void Send_Others_OnJobSelected(JobInstance jobInstance)

View File

@ -94,7 +94,7 @@ Material:
- _Mode: 0 - _Mode: 0
- _OcclusionStrength: 1 - _OcclusionStrength: 1
- _Parallax: 0.02 - _Parallax: 0.02
- _Rotation: 5.204089 - _Rotation: 11.468084
- _SmoothnessTextureChannel: 0 - _SmoothnessTextureChannel: 0
- _SpecularHighlights: 1 - _SpecularHighlights: 1
- _SrcBlend: 1 - _SrcBlend: 1

File diff suppressed because one or more lines are too long

View File

@ -26,4 +26,7 @@ EditorBuildSettings:
- enabled: 1 - enabled: 1
path: Assets/Scenes/4-Skellyard.unity path: Assets/Scenes/4-Skellyard.unity
guid: 91699a1fcbef1fe4286aa0c3aa61c2c0 guid: 91699a1fcbef1fe4286aa0c3aa61c2c0
- enabled: 1
path: Assets/Scenes/4-Dayard.unity
guid: 5f7e6d9b6398b934cb82815de4a7af62
m_configObjects: {} m_configObjects: {}

View File

@ -134,7 +134,7 @@ PlayerSettings:
16:10: 1 16:10: 1
16:9: 1 16:9: 1
Others: 1 Others: 1
bundleVersion: 0.9.1 bundleVersion: 0.9.3b
preloadedAssets: preloadedAssets:
- {fileID: 947724257692438902, guid: cd9921cbc21600a45b5c842c4e6ef004, type: 3} - {fileID: 947724257692438902, guid: cd9921cbc21600a45b5c842c4e6ef004, type: 3}
- {fileID: 753911528859556811, guid: bc291c869c1aa9744be1f56806b8c99d, type: 3} - {fileID: 753911528859556811, guid: bc291c869c1aa9744be1f56806b8c99d, type: 3}

View File

@ -0,0 +1,16 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &1
MonoBehaviour:
m_ObjectHideFlags: 61
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: a287be6c49135cd4f9b2b8666c39d999, type: 3}
m_Name:
m_EditorClassIdentifier:
assetDefaultFramerate: 60
m_DefaultFrameRate: 60