rizzeadmin
/
HighGroundRoyaleNetcode
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added some post merge stuff

Browse Source
dev-hazim
Hazim Bin Ijaz 18 hours ago
parent 466a176250
commit 3850e59fb5
4 changed files with 164 additions and 22 deletions
Show Stats Download Patch File Download Diff File

24
Assets/Prefabs/CharGFX/CharacterGraphics/PlayerGraphics_MystoArcher_Boy.prefab
Unescape Escape View File

@ -364,10 +364,32 @@ PrefabInstance:
- {fileID: 6334711230929553899, guid: fa1d4a781ca0bc648be2041d0795fc10, type: 3}
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents: []
m_AddedComponents:
- targetCorrespondingSourceObject: {fileID: 1129655148296550650, guid: fa1d4a781ca0bc648be2041d0795fc10, type: 3}
insertIndex: -1
addedObject: {fileID: 7105560221334403057}
m_SourcePrefab: {fileID: 100100000, guid: fa1d4a781ca0bc648be2041d0795fc10, type: 3}
--- !u!4 &5084646064784695165 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 74668495115522961, guid: fa1d4a781ca0bc648be2041d0795fc10, type: 3}
m_PrefabInstance: {fileID: 5159168255999495404}
m_PrefabAsset: {fileID: 0}
--- !u!1 &5202883999868548118 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 1129655148296550650, guid: fa1d4a781ca0bc648be2041d0795fc10, type: 3}
m_PrefabInstance: {fileID: 5159168255999495404}
m_PrefabAsset: {fileID: 0}
--- !u!114 &7105560221334403057
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5202883999868548118}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: ed44dc3c5c8107d499c6223ba1366b68, type: 3}
m_Name:
m_EditorClassIdentifier:
outlineMaterial: {fileID: 2100000, guid: 7d59a0e48d5e5a34bbc8919ff8e3cecd, type: 2}
outlineWidth: 0.1

32
Assets/Prefabs/CharGFX/CharacterGraphics/PlayerGraphics_WizardArcher_Boy.prefab
Unescape Escape View File

@ -8,6 +8,10 @@ PrefabInstance:
serializedVersion: 3
m_TransformParent: {fileID: 5771644107772544412}
m_Modifications:
- target: {fileID: 247286024415336201, guid: d850c7fb35f2afc49b37cb3691fca59d, type: 3}
propertyPath: m_IsActive
value: 1
objectReference: {fileID: 0}
- target: {fileID: 1638802233889099490, guid: d850c7fb35f2afc49b37cb3691fca59d, type: 3}
propertyPath: m_Name
value: Wizard
@ -56,12 +60,38 @@ PrefabInstance:
propertyPath: m_Controller
value:
objectReference: {fileID: 22100000, guid: 0b8f7a21eb7f3f04191b3af9df0757ab, type: 2}
- target: {fileID: 6069266980640121836, guid: d850c7fb35f2afc49b37cb3691fca59d, type: 3}
propertyPath: m_IsActive
value: 1
objectReference: {fileID: 0}
m_RemovedComponents:
- {fileID: 5410456523969007138, guid: d850c7fb35f2afc49b37cb3691fca59d, type: 3}
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents: []
m_AddedComponents:
- targetCorrespondingSourceObject: {fileID: 6069266980640121836, guid: d850c7fb35f2afc49b37cb3691fca59d, type: 3}
insertIndex: -1
addedObject: {fileID: 8698181785715692114}
m_SourcePrefab: {fileID: 100100000, guid: d850c7fb35f2afc49b37cb3691fca59d, type: 3}
--- !u!1 &738510113788701076 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 6069266980640121836, guid: d850c7fb35f2afc49b37cb3691fca59d, type: 3}
m_PrefabInstance: {fileID: 6775077541308222072}
m_PrefabAsset: {fileID: 0}
--- !u!114 &8698181785715692114
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 738510113788701076}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: ed44dc3c5c8107d499c6223ba1366b68, type: 3}
m_Name:
m_EditorClassIdentifier:
outlineMaterial: {fileID: 2100000, guid: 7d59a0e48d5e5a34bbc8919ff8e3cecd, type: 2}
outlineWidth: 0.1
--- !u!4 &4895422135797063200 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 2158879392026317912, guid: d850c7fb35f2afc49b37cb3691fca59d, type: 3}

109
Assets/Scenes/BossRoom/DungeonEntrance.unity
Unescape Escape View File

@ -234,6 +234,10 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_Platforms: []
numberOfPlayers: 5
platforms: []
platformTransforms: []
centerPoint: {fileID: 0}
shapeRadius: 5
--- !u!114 &286165429
MonoBehaviour:
m_ObjectHideFlags: 0
@ -882,6 +886,7 @@ GameObject:
- component: {fileID: 249976107358570838}
- component: {fileID: 249976107358570841}
- component: {fileID: 249976107358570840}
- component: {fileID: 249976107358570842}
m_Layer: 0
m_Name: SM_Env_Hell_Circle_01 (1)
m_TagString: Untagged
@ -997,6 +1002,20 @@ Animator:
m_AllowConstantClipSamplingOptimization: 1
m_KeepAnimatorStateOnDisable: 0
m_WriteDefaultValuesOnDisable: 0
--- !u!114 &249976107358570842
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 248836275302926266}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: ed44dc3c5c8107d499c6223ba1366b68, type: 3}
m_Name:
m_EditorClassIdentifier:
outlineMaterial: {fileID: 2100000, guid: 7d59a0e48d5e5a34bbc8919ff8e3cecd, type: 2}
outlineWidth: 0.1
--- !u!33 &1189011597376318600
MeshFilter:
m_ObjectHideFlags: 0
@ -1078,6 +1097,7 @@ GameObject:
- component: {fileID: 1223475210011116502}
- component: {fileID: 1223475210011116505}
- component: {fileID: 1223475210011116504}
- component: {fileID: 1223475210011116506}
m_Layer: 0
m_Name: SM_Env_Hell_Circle_01 (3)
m_TagString: Untagged
@ -1193,6 +1213,20 @@ Animator:
m_AllowConstantClipSamplingOptimization: 1
m_KeepAnimatorStateOnDisable: 0
m_WriteDefaultValuesOnDisable: 0
--- !u!114 &1223475210011116506
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1222362877196586298}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: ed44dc3c5c8107d499c6223ba1366b68, type: 3}
m_Name:
m_EditorClassIdentifier:
outlineMaterial: {fileID: 2100000, guid: 7d59a0e48d5e5a34bbc8919ff8e3cecd, type: 2}
outlineWidth: 0.1
--- !u!1 &1245558867416036815
GameObject:
m_ObjectHideFlags: 0
@ -1275,6 +1309,7 @@ GameObject:
- component: {fileID: 1326862948614608680}
- component: {fileID: 1326862948614608683}
- component: {fileID: 1326862948614608682}
- component: {fileID: 1326862948614608684}
m_Layer: 0
m_Name: SM_Env_Hell_Circle_01 (5)
m_TagString: Untagged
@ -1390,6 +1425,20 @@ Animator:
m_AllowConstantClipSamplingOptimization: 1
m_KeepAnimatorStateOnDisable: 0
m_WriteDefaultValuesOnDisable: 0
--- !u!114 &1326862948614608684
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1325723386991991240}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: ed44dc3c5c8107d499c6223ba1366b68, type: 3}
m_Name:
m_EditorClassIdentifier:
outlineMaterial: {fileID: 2100000, guid: 7d59a0e48d5e5a34bbc8919ff8e3cecd, type: 2}
outlineWidth: 0.1
--- !u!33 &3136216454265548515
MeshFilter:
m_ObjectHideFlags: 0
@ -1456,6 +1505,7 @@ GameObject:
- component: {fileID: 3169561862507413953}
- component: {fileID: 3169561862507413956}
- component: {fileID: 3169561862507413955}
- component: {fileID: 3169561862507413957}
m_Layer: 0
m_Name: SM_Env_Hell_Circle_01 (6)
m_TagString: Untagged
@ -1571,6 +1621,20 @@ Animator:
m_AllowConstantClipSamplingOptimization: 1
m_KeepAnimatorStateOnDisable: 0
m_WriteDefaultValuesOnDisable: 0
--- !u!114 &3169561862507413957
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3166196630092877649}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: ed44dc3c5c8107d499c6223ba1366b68, type: 3}
m_Name:
m_EditorClassIdentifier:
outlineMaterial: {fileID: 2100000, guid: 7d59a0e48d5e5a34bbc8919ff8e3cecd, type: 2}
outlineWidth: 0.1
--- !u!1 &5194562349502858591
GameObject:
m_ObjectHideFlags: 0
@ -1587,6 +1651,7 @@ GameObject:
- component: {fileID: 5215249593494578415}
- component: {fileID: 5215249593494578418}
- component: {fileID: 5215249593494578417}
- component: {fileID: 5215249593494578419}
m_Layer: 0
m_Name: SM_Env_Hell_Circle_01 (2)
m_TagString: Untagged
@ -1752,6 +1817,20 @@ Animator:
m_AllowConstantClipSamplingOptimization: 1
m_KeepAnimatorStateOnDisable: 0
m_WriteDefaultValuesOnDisable: 0
--- !u!114 &5215249593494578419
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5194562349502858591}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: ed44dc3c5c8107d499c6223ba1366b68, type: 3}
m_Name:
m_EditorClassIdentifier:
outlineMaterial: {fileID: 2100000, guid: 7d59a0e48d5e5a34bbc8919ff8e3cecd, type: 2}
outlineWidth: 0.1
--- !u!4 &5590359088119101749
Transform:
m_ObjectHideFlags: 0
@ -1783,6 +1862,7 @@ GameObject:
- component: {fileID: 5615547279758710379}
- component: {fileID: 5615547279758710382}
- component: {fileID: 5615547279758710381}
- component: {fileID: 5615547279758710383}
m_Layer: 0
m_Name: SM_Env_Hell_Circle_01
m_TagString: Untagged
@ -1933,6 +2013,20 @@ Animator:
m_AllowConstantClipSamplingOptimization: 1
m_KeepAnimatorStateOnDisable: 0
m_WriteDefaultValuesOnDisable: 0
--- !u!114 &5615547279758710383
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5591479862615341019}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: ed44dc3c5c8107d499c6223ba1366b68, type: 3}
m_Name:
m_EditorClassIdentifier:
outlineMaterial: {fileID: 2100000, guid: 7d59a0e48d5e5a34bbc8919ff8e3cecd, type: 2}
outlineWidth: 0.1
--- !u!1 &6995672694789591046
GameObject:
m_ObjectHideFlags: 0
@ -1949,6 +2043,7 @@ GameObject:
- component: {fileID: 7017483914677023158}
- component: {fileID: 7017483914677023161}
- component: {fileID: 7017483914677023160}
- component: {fileID: 7017483914677023162}
m_Layer: 0
m_Name: SM_Env_Hell_Circle_01 (4)
m_TagString: Untagged
@ -2114,6 +2209,20 @@ Animator:
m_AllowConstantClipSamplingOptimization: 1
m_KeepAnimatorStateOnDisable: 0
m_WriteDefaultValuesOnDisable: 0
--- !u!114 &7017483914677023162
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6995672694789591046}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: ed44dc3c5c8107d499c6223ba1366b68, type: 3}
m_Name:
m_EditorClassIdentifier:
outlineMaterial: {fileID: 2100000, guid: 7d59a0e48d5e5a34bbc8919ff8e3cecd, type: 2}
outlineWidth: 0.1
--- !u!1660057539 &9223372036854775807
SceneRoots:
m_ObjectHideFlags: 0

21
Assets/Scripts/Gameplay/UserInput/ClientInputSender.cs
Unescape Escape View File

@ -727,26 +727,7 @@ namespace Unity.BossRoom.Gameplay.UserInput
Debug.LogWarning("No valid target found for swapping.");
}
void AddMultiplier(ServerCharacter targetCharacter)
{
Debug.Log("AddMultiplier1");
ServerCharacter currentServerCharacter = GetComponent<ServerCharacter>();
Debug.Log("AddMultiplier2");
currentServerCharacter.m_OccupiedPlatform.toBeSwapped = true;
Debug.Log("AddMultiplier3");
targetCharacter.m_OccupiedPlatform.toBeSwapped = true;
Debug.Log("AddMultiplier4");
float scoreMultiplayer = PlatformManager.Instance.CalculateScore(targetCharacter.m_OccupiedPlatform, currentServerCharacter.m_OccupiedPlatform);
Debug.Log("AddMultiplier5");
currentServerCharacter.m_OccupiedPlatform.scoreMultiplier = scoreMultiplayer;
Debug.Log("AddMultiplier6");
targetCharacter.m_OccupiedPlatform.scoreMultiplier = scoreMultiplayer;
Debug.Log("AddMultiplier7");
currentServerCharacter.m_OccupiedPlatform.swapeeID = targetCharacter.NetworkObjectId;
Debug.Log("AddMultiplier8");
targetCharacter.m_OccupiedPlatform.swapeeID = currentServerCharacter.NetworkObjectId;
Debug.Log("AddMultiplier9");
}
void UpdateAction1()
{
var isHoldingNetworkObject =

Write Preview
Loading…
Cancel
Save