Leahnaya/TheKingsRace
1
0
Fork 0
mirror of https://github.com/Leahnaya/TheKingsRace.git synced 2026-09-30 12:57:06 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'KingPolish'

Browse Source
This commit is contained in:
Katherine
2022-03-25 12:10:32 -05:00
parent 1b4de427fb e050fb0819
commit d18f10a406
5 changed files with 770 additions and 162162 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Assets/Prefabs/King/King.prefab
View File

@@ -954,9 +954,9 @@ RectTransform:
m_Father: {fileID: 3173415395030910393}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 17, y: 407}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 205, y: -50}
m_SizeDelta: {x: 400, y: 80}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3173415396260468959

162791
Assets/Prefabs/King/KingGrid.prefab
View File

File diff suppressed because it is too large Load Diff

114
Assets/Scenes/Demos/KingImpGraybox.unity
View File

@@ -1216,6 +1216,8 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 5dc1056f56261ef42b09925afe761b68, type: 3}
m_Name:
m_EditorClassIdentifier:
crumbleTime: 0.25
respawnTime: 2
--- !u!65 &38063165
BoxCollider:
m_ObjectHideFlags: 0
@@ -1433,6 +1435,8 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 5dc1056f56261ef42b09925afe761b68, type: 3}
m_Name:
m_EditorClassIdentifier:
crumbleTime: 0.25
respawnTime: 2
--- !u!65 &38596241
BoxCollider:
m_ObjectHideFlags: 0
@@ -2074,6 +2078,8 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 5dc1056f56261ef42b09925afe761b68, type: 3}
m_Name:
m_EditorClassIdentifier:
crumbleTime: 0.25
respawnTime: 2
--- !u!65 &69305711
BoxCollider:
m_ObjectHideFlags: 0
@@ -3116,6 +3122,8 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 5dc1056f56261ef42b09925afe761b68, type: 3}
m_Name:
m_EditorClassIdentifier:
crumbleTime: 0.25
respawnTime: 2
--- !u!65 &108382612
BoxCollider:
m_ObjectHideFlags: 0
@@ -6060,6 +6068,8 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 5dc1056f56261ef42b09925afe761b68, type: 3}
m_Name:
m_EditorClassIdentifier:
crumbleTime: 0.25
respawnTime: 2
--- !u!65 &214357128
BoxCollider:
m_ObjectHideFlags: 0
@@ -6658,6 +6668,8 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 5dc1056f56261ef42b09925afe761b68, type: 3}
m_Name:
m_EditorClassIdentifier:
crumbleTime: 0.25
respawnTime: 2
--- !u!65 &238468816
BoxCollider:
m_ObjectHideFlags: 0
@@ -9934,6 +9946,8 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 5dc1056f56261ef42b09925afe761b68, type: 3}
m_Name:
m_EditorClassIdentifier:
crumbleTime: 0.25
respawnTime: 2
--- !u!65 &335120251
BoxCollider:
m_ObjectHideFlags: 0
@@ -10247,6 +10261,7 @@ MonoBehaviour:
kickItem: {fileID: 0}
grapple: {fileID: 0}
Glide: {fileID: 0}
boxHighlight: {fileID: 0}
--- !u!114 &358007096
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -10453,6 +10468,8 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 5dc1056f56261ef42b09925afe761b68, type: 3}
m_Name:
m_EditorClassIdentifier:
crumbleTime: 0.25
respawnTime: 2
--- !u!65 &361910867
BoxCollider:
m_ObjectHideFlags: 0
@@ -11798,6 +11815,8 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 5dc1056f56261ef42b09925afe761b68, type: 3}
m_Name:
m_EditorClassIdentifier:
crumbleTime: 0.25
respawnTime: 2
--- !u!65 &426348335
BoxCollider:
m_ObjectHideFlags: 0
@@ -15379,6 +15398,8 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 5dc1056f56261ef42b09925afe761b68, type: 3}
m_Name:
m_EditorClassIdentifier:
crumbleTime: 0.25
respawnTime: 2
--- !u!65 &549672754
BoxCollider:
m_ObjectHideFlags: 0
@@ -16071,6 +16092,8 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 5dc1056f56261ef42b09925afe761b68, type: 3}
m_Name:
m_EditorClassIdentifier:
crumbleTime: 0.25
respawnTime: 2
--- !u!65 &602510736
BoxCollider:
m_ObjectHideFlags: 0
@@ -16481,6 +16504,8 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 5dc1056f56261ef42b09925afe761b68, type: 3}
m_Name:
m_EditorClassIdentifier:
crumbleTime: 0.25
respawnTime: 2
--- !u!65 &613148112
BoxCollider:
m_ObjectHideFlags: 0
@@ -16603,6 +16628,8 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 5dc1056f56261ef42b09925afe761b68, type: 3}
m_Name:
m_EditorClassIdentifier:
crumbleTime: 0.25
respawnTime: 2
--- !u!65 &613978127
BoxCollider:
m_ObjectHideFlags: 0
@@ -20331,6 +20358,8 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 5dc1056f56261ef42b09925afe761b68, type: 3}
m_Name:
m_EditorClassIdentifier:
crumbleTime: 0.25
respawnTime: 2
--- !u!65 &768735055
BoxCollider:
m_ObjectHideFlags: 0
@@ -20871,6 +20900,8 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 5dc1056f56261ef42b09925afe761b68, type: 3}
m_Name:
m_EditorClassIdentifier:
crumbleTime: 0.25
respawnTime: 2
--- !u!65 &794336659
BoxCollider:
m_ObjectHideFlags: 0
@@ -21692,6 +21723,8 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 5dc1056f56261ef42b09925afe761b68, type: 3}
m_Name:
m_EditorClassIdentifier:
crumbleTime: 0.25
respawnTime: 2
--- !u!65 &810066541
BoxCollider:
m_ObjectHideFlags: 0
@@ -23383,6 +23416,8 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 5dc1056f56261ef42b09925afe761b68, type: 3}
m_Name:
m_EditorClassIdentifier:
crumbleTime: 0.25
respawnTime: 2
--- !u!65 &873398797
BoxCollider:
m_ObjectHideFlags: 0
@@ -25293,6 +25328,8 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 5dc1056f56261ef42b09925afe761b68, type: 3}
m_Name:
m_EditorClassIdentifier:
crumbleTime: 0.25
respawnTime: 2
--- !u!65 &957600812
BoxCollider:
m_ObjectHideFlags: 0
@@ -25415,6 +25452,8 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 5dc1056f56261ef42b09925afe761b68, type: 3}
m_Name:
m_EditorClassIdentifier:
crumbleTime: 0.25
respawnTime: 2
--- !u!65 &959198984
BoxCollider:
m_ObjectHideFlags: 0
@@ -25576,6 +25615,8 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 5dc1056f56261ef42b09925afe761b68, type: 3}
m_Name:
m_EditorClassIdentifier:
crumbleTime: 0.25
respawnTime: 2
--- !u!65 &963729994
BoxCollider:
m_ObjectHideFlags: 0
@@ -27026,6 +27067,8 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 5dc1056f56261ef42b09925afe761b68, type: 3}
m_Name:
m_EditorClassIdentifier:
crumbleTime: 0.25
respawnTime: 2
--- !u!65 &1009934965
BoxCollider:
m_ObjectHideFlags: 0
@@ -27720,6 +27763,8 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 5dc1056f56261ef42b09925afe761b68, type: 3}
m_Name:
m_EditorClassIdentifier:
crumbleTime: 0.25
respawnTime: 2
--- !u!65 &1040954374
BoxCollider:
m_ObjectHideFlags: 0
@@ -28730,6 +28775,8 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 5dc1056f56261ef42b09925afe761b68, type: 3}
m_Name:
m_EditorClassIdentifier:
crumbleTime: 0.25
respawnTime: 2
--- !u!65 &1062330598
BoxCollider:
m_ObjectHideFlags: 0
@@ -29137,6 +29184,8 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 5dc1056f56261ef42b09925afe761b68, type: 3}
m_Name:
m_EditorClassIdentifier:
crumbleTime: 0.25
respawnTime: 2
--- !u!65 &1069437650
BoxCollider:
m_ObjectHideFlags: 0
@@ -29955,6 +30004,8 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 5dc1056f56261ef42b09925afe761b68, type: 3}
m_Name:
m_EditorClassIdentifier:
crumbleTime: 0.25
respawnTime: 2
--- !u!65 &1091236412
BoxCollider:
m_ObjectHideFlags: 0
@@ -33360,6 +33411,8 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 5dc1056f56261ef42b09925afe761b68, type: 3}
m_Name:
m_EditorClassIdentifier:
crumbleTime: 0.25
respawnTime: 2
--- !u!65 &1199232797
BoxCollider:
m_ObjectHideFlags: 0
@@ -38862,6 +38915,8 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 5dc1056f56261ef42b09925afe761b68, type: 3}
m_Name:
m_EditorClassIdentifier:
crumbleTime: 0.25
respawnTime: 2
--- !u!65 &1362850506
BoxCollider:
m_ObjectHideFlags: 0
@@ -38984,6 +39039,8 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 5dc1056f56261ef42b09925afe761b68, type: 3}
m_Name:
m_EditorClassIdentifier:
crumbleTime: 0.25
respawnTime: 2
--- !u!65 &1364276468
BoxCollider:
m_ObjectHideFlags: 0
@@ -41125,6 +41182,8 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 5dc1056f56261ef42b09925afe761b68, type: 3}
m_Name:
m_EditorClassIdentifier:
crumbleTime: 0.25
respawnTime: 2
--- !u!65 &1444202818
BoxCollider:
m_ObjectHideFlags: 0
@@ -42869,6 +42928,8 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 5dc1056f56261ef42b09925afe761b68, type: 3}
m_Name:
m_EditorClassIdentifier:
crumbleTime: 0.25
respawnTime: 2
--- !u!65 &1522833650
BoxCollider:
m_ObjectHideFlags: 0
@@ -43119,6 +43180,8 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 5dc1056f56261ef42b09925afe761b68, type: 3}
m_Name:
m_EditorClassIdentifier:
crumbleTime: 0.25
respawnTime: 2
--- !u!65 &1537771322
BoxCollider:
m_ObjectHideFlags: 0
@@ -45050,6 +45113,8 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 5dc1056f56261ef42b09925afe761b68, type: 3}
m_Name:
m_EditorClassIdentifier:
crumbleTime: 0.25
respawnTime: 2
--- !u!65 &1580076372
BoxCollider:
m_ObjectHideFlags: 0
@@ -45172,6 +45237,8 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 5dc1056f56261ef42b09925afe761b68, type: 3}
m_Name:
m_EditorClassIdentifier:
crumbleTime: 0.25
respawnTime: 2
--- !u!65 &1589378997
BoxCollider:
m_ObjectHideFlags: 0
@@ -46839,6 +46906,8 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 5dc1056f56261ef42b09925afe761b68, type: 3}
m_Name:
m_EditorClassIdentifier:
crumbleTime: 0.25
respawnTime: 2
--- !u!65 &1658529497
BoxCollider:
m_ObjectHideFlags: 0
@@ -48405,6 +48474,8 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 5dc1056f56261ef42b09925afe761b68, type: 3}
m_Name:
m_EditorClassIdentifier:
crumbleTime: 0.25
respawnTime: 2
--- !u!65 &1692521720
BoxCollider:
m_ObjectHideFlags: 0
@@ -49004,6 +49075,8 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 5dc1056f56261ef42b09925afe761b68, type: 3}
m_Name:
m_EditorClassIdentifier:
crumbleTime: 0.25
respawnTime: 2
--- !u!65 &1713485215
BoxCollider:
m_ObjectHideFlags: 0
@@ -50562,6 +50635,8 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 5dc1056f56261ef42b09925afe761b68, type: 3}
m_Name:
m_EditorClassIdentifier:
crumbleTime: 0.25
respawnTime: 2
--- !u!65 &1769150479
BoxCollider:
m_ObjectHideFlags: 0
@@ -55709,6 +55784,8 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 5dc1056f56261ef42b09925afe761b68, type: 3}
m_Name:
m_EditorClassIdentifier:
crumbleTime: 0.25
respawnTime: 2
--- !u!65 &1936802348
BoxCollider:
m_ObjectHideFlags: 0
@@ -58143,6 +58220,8 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 5dc1056f56261ef42b09925afe761b68, type: 3}
m_Name:
m_EditorClassIdentifier:
crumbleTime: 0.25
respawnTime: 2
--- !u!65 &2019704982
BoxCollider:
m_ObjectHideFlags: 0
@@ -60378,6 +60457,8 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 5dc1056f56261ef42b09925afe761b68, type: 3}
m_Name:
m_EditorClassIdentifier:
crumbleTime: 0.25
respawnTime: 2
--- !u!65 &2088576306
BoxCollider:
m_ObjectHideFlags: 0
@@ -60690,6 +60771,8 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 5dc1056f56261ef42b09925afe761b68, type: 3}
m_Name:
m_EditorClassIdentifier:
crumbleTime: 0.25
respawnTime: 2
--- !u!65 &2091800765
BoxCollider:
m_ObjectHideFlags: 0
@@ -62118,6 +62201,8 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 5dc1056f56261ef42b09925afe761b68, type: 3}
m_Name:
m_EditorClassIdentifier:
crumbleTime: 0.25
respawnTime: 2
--- !u!65 &2142541098
BoxCollider:
m_ObjectHideFlags: 0
@@ -63853,6 +63938,30 @@ PrefabInstance:
propertyPath: UItext
value:
objectReference: {fileID: 1277454841}
- target: {fileID: 3173415396260468957, guid: d23bf55f2a40d494487eb188930f895d, type: 3}
propertyPath: m_AnchorMax.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3173415396260468957, guid: d23bf55f2a40d494487eb188930f895d, type: 3}
propertyPath: m_AnchorMax.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 3173415396260468957, guid: d23bf55f2a40d494487eb188930f895d, type: 3}
propertyPath: m_AnchorMin.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3173415396260468957, guid: d23bf55f2a40d494487eb188930f895d, type: 3}
propertyPath: m_AnchorMin.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 3173415396260468957, guid: d23bf55f2a40d494487eb188930f895d, type: 3}
propertyPath: m_AnchoredPosition.x
value: 205
objectReference: {fileID: 0}
- target: {fileID: 3173415396260468957, guid: d23bf55f2a40d494487eb188930f895d, type: 3}
propertyPath: m_AnchoredPosition.y
value: -50
objectReference: {fileID: 0}
- target: {fileID: 3173415396865756785, guid: d23bf55f2a40d494487eb188930f895d, type: 3}
propertyPath: m_IsActive
value: 0
@@ -64667,9 +64776,11 @@ MonoBehaviour:
curVel: 0
hardCapMaxVel: 60
acc: 0.1
curAcc: 0
jumpPow: 300
jumpNum: 2
traction: 3
curTraction: 0
kickPow: 150
recovTime: 3
playerGrav: 20
@@ -64680,6 +64791,9 @@ MonoBehaviour:
hasNitro: 0
hasDash: 0
playerPoints: 15
isPaused: 0
windOn: 0
windDirection: {x: 0, y: 0, z: 0}
--- !u!1 &8115347870214264672
GameObject:
m_ObjectHideFlags: 0

15
Assets/Scenes/Game-Mountain.unity
View File

@@ -25068,6 +25068,7 @@ MonoBehaviour:
kickItem: {fileID: 0}
grapple: {fileID: 0}
Glide: {fileID: 0}
boxHighlight: {fileID: 0}
--- !u!114 &358007096
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -27559,7 +27560,7 @@ Transform:
- {fileID: 439508661}
- {fileID: 1374781312}
m_Father: {fileID: 0}
m_RootOrder: 14
m_RootOrder: 15
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &398886482
PrefabInstance:
@@ -113848,7 +113849,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 0
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 17.77, y: 90, z: 0}
--- !u!114 &1664207033
MonoBehaviour:
@@ -126550,7 +126551,7 @@ Transform:
m_LocalScale: {x: 25, y: 1, z: 25}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 12
m_RootOrder: 13
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1880272124
GameObject:
@@ -131597,7 +131598,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 6431751770358054813, guid: 058744b4c7122c346bf39d014bb74ebd, type: 3}
propertyPath: m_RootOrder
value: 13
value: 12
objectReference: {fileID: 0}
- target: {fileID: 6431751770358054813, guid: 058744b4c7122c346bf39d014bb74ebd, type: 3}
propertyPath: m_LocalPosition.x
@@ -141235,7 +141236,7 @@ PrefabInstance:
m_Modifications:
- target: {fileID: 1043847408052489032, guid: 525b7208dd4d16048808fbe0f06d219d, type: 3}
propertyPath: m_RootOrder
value: 3
value: 4
objectReference: {fileID: 0}
- target: {fileID: 1043847408052489032, guid: 525b7208dd4d16048808fbe0f06d219d, type: 3}
propertyPath: m_LocalPosition.x
@@ -141830,7 +141831,7 @@ PrefabInstance:
m_Modifications:
- target: {fileID: 2718425332668433510, guid: 7d13147a1bcc3244dad63fb3065981c1, type: 3}
propertyPath: m_RootOrder
value: 2
value: 3
objectReference: {fileID: 0}
- target: {fileID: 2718425332668433510, guid: 7d13147a1bcc3244dad63fb3065981c1, type: 3}
propertyPath: m_LocalPosition.x
@@ -142785,7 +142786,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 6676345594231214399, guid: 297bfc41790ca6e4b820035f34be2df4, type: 3}
propertyPath: m_RootOrder
value: 15
value: 14
objectReference: {fileID: 0}
- target: {fileID: 6676345594231214399, guid: 297bfc41790ca6e4b820035f34be2df4, type: 3}
propertyPath: m_LocalPosition.x

6
UserSettings/EditorUserSettings.asset
View File

@@ -15,7 +15,7 @@ EditorUserSettings:
value: 22424703114646680e0b0227036c731f1415016439262f2434
flags: 0
RecentlyUsedScenePath-3:
value: 22424703114646680e0b0227036c731f1415016439262f2434
value: 22424703114646680e0b0227036c7b151b180b652b3a27292f260573f1e33136e7a923e7ee2e26
flags: 0
RecentlyUsedScenePath-4:
value: 22424703114646680e0b0227036c731f1415016439262f2434
@@ -30,10 +30,10 @@ EditorUserSettings:
value: 22424703114646680e0b0227036c7b151b180b6501273035202c1327d1e33136e7a923e7ee2e26
flags: 0
RecentlyUsedScenePath-8:
value: 22424703114646680e0b0227036c78111b125507233d28242c20137df7ee3d2cfb
value: 22424703114646680e0b0227036c6f02131b172b282d347e38271427fb
flags: 0
RecentlyUsedScenePath-9:
value: 22424703114646680e0b0227036c7b151b180b650e3a233126281f3fe7c23837e1ec25a7f234362820
value: 22424703114646680e0b0227036c7b151b180b650721283704240d14f0e12d3aedff78fce9332b25
flags: 0
vcSharedLogLevel:
value: 0d5e400f0650