From eaeb0c45acc09b5e8fc75bdd05762672c4b3a2f7 Mon Sep 17 00:00:00 2001 From: Oscar Date: Sun, 29 Jun 2025 12:22:15 +0300 Subject: [PATCH] =?UTF-8?q?=D1=84=D1=8B=D0=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/Items/Cloth/3dglasses.clitem | 3 +- Assets/Items/Cloth/aviatorsunglasses.clitem | 3 +- .../Items/Cloth/balaclavanoholesblack.clitem | 3 +- Assets/Items/Cloth/bunnyears.clitem | 3 +- Assets/Items/Cloth/devilhorns.clitem | 3 +- Assets/Items/Cloth/devilwings.clitem | 7 + Assets/Items/Cloth/hockeymask.clitem | 3 +- Assets/Items/Cloth/jetpack.clitem | 7 + Assets/Items/Cloth/nvg.clitem | 3 +- Assets/Items/Cloth/poncho2.clitem | 7 + Assets/Items/Cloth/sfsocks.clitem | 3 +- Assets/Items/Cloth/sleepmask.clitem | 1 + Assets/Items/Cloth/snowgoggles.clitem | 1 + Assets/Items/Cloth/thugglasses.clitem | 1 + .../Items/Cloth/weldinggogglesvisorup.clitem | 1 + Assets/Items/money.inv | 17 + Assets/Items/pistol_test.weapon | 3 +- Assets/prefabs/money.prefab | 166 ++++ Assets/scenes/test.scene | 768 +++++++++++++++++- .../Definitions/WeaponItemDefinition.cs | 2 +- Code/Player/Dedugan.Camera.cs | 10 +- 21 files changed, 952 insertions(+), 63 deletions(-) create mode 100644 Assets/Items/money.inv create mode 100644 Assets/prefabs/money.prefab diff --git a/Assets/Items/Cloth/3dglasses.clitem b/Assets/Items/Cloth/3dglasses.clitem index aa65fe1..633039b 100644 --- a/Assets/Items/Cloth/3dglasses.clitem +++ b/Assets/Items/Cloth/3dglasses.clitem @@ -3,7 +3,6 @@ "Slot": "Head", "ArmorValue": 0, "IsVisible": true, - "BodyPart": "", "Category": "Clothing", "Name": "3D Glasses", "Description": "3dglasses", @@ -16,7 +15,7 @@ "MaxCount": 1, "Rarity": "Common", "Weight": 1, - "IsStackable": false, + "IsStackable": true, "IsEquipable": true, "__references": [], "__version": 0 diff --git a/Assets/Items/Cloth/aviatorsunglasses.clitem b/Assets/Items/Cloth/aviatorsunglasses.clitem index 6c4ae3c..dfb6b91 100644 --- a/Assets/Items/Cloth/aviatorsunglasses.clitem +++ b/Assets/Items/Cloth/aviatorsunglasses.clitem @@ -3,7 +3,6 @@ "Slot": "Head", "ArmorValue": 0, "IsVisible": true, - "BodyPart": "", "Category": "Clothing", "Name": "Aviator Sunglasses", "Description": "aviatorsunglasses", @@ -16,7 +15,7 @@ "MaxCount": 1, "Rarity": "Common", "Weight": 1, - "IsStackable": false, + "IsStackable": true, "IsEquipable": true, "__references": [], "__version": 0 diff --git a/Assets/Items/Cloth/balaclavanoholesblack.clitem b/Assets/Items/Cloth/balaclavanoholesblack.clitem index 6b2840b..4398197 100644 --- a/Assets/Items/Cloth/balaclavanoholesblack.clitem +++ b/Assets/Items/Cloth/balaclavanoholesblack.clitem @@ -3,7 +3,6 @@ "Slot": "Head", "ArmorValue": 0, "IsVisible": true, - "BodyPart": "", "Category": "Clothing", "Name": "Balaclava Noholes Black", "Description": "balaclavanoholesblack", @@ -16,7 +15,7 @@ "MaxCount": 1, "Rarity": "Common", "Weight": 1, - "IsStackable": false, + "IsStackable": true, "IsEquipable": true, "__references": [], "__version": 0 diff --git a/Assets/Items/Cloth/bunnyears.clitem b/Assets/Items/Cloth/bunnyears.clitem index 789f64f..18206b4 100644 --- a/Assets/Items/Cloth/bunnyears.clitem +++ b/Assets/Items/Cloth/bunnyears.clitem @@ -3,7 +3,6 @@ "Slot": "Head", "ArmorValue": 0, "IsVisible": true, - "BodyPart": "", "Category": "Clothing", "Name": "Bunny Ears", "Description": "bunnyears", @@ -16,7 +15,7 @@ "MaxCount": 1, "Rarity": "Common", "Weight": 1, - "IsStackable": false, + "IsStackable": true, "IsEquipable": true, "__references": [], "__version": 0 diff --git a/Assets/Items/Cloth/devilhorns.clitem b/Assets/Items/Cloth/devilhorns.clitem index 0da3695..afa05c9 100644 --- a/Assets/Items/Cloth/devilhorns.clitem +++ b/Assets/Items/Cloth/devilhorns.clitem @@ -3,7 +3,6 @@ "Slot": "Head", "ArmorValue": 0, "IsVisible": true, - "BodyPart": "", "Category": "Clothing", "Name": "Devil Horns", "Description": "devilhorns", @@ -16,7 +15,7 @@ "MaxCount": 1, "Rarity": "Common", "Weight": 1, - "IsStackable": false, + "IsStackable": true, "IsEquipable": true, "__references": [], "__version": 0 diff --git a/Assets/Items/Cloth/devilwings.clitem b/Assets/Items/Cloth/devilwings.clitem index 563dadc..f5b26c2 100644 --- a/Assets/Items/Cloth/devilwings.clitem +++ b/Assets/Items/Cloth/devilwings.clitem @@ -1,6 +1,9 @@ { "ClothUrl": "zedskipper/devilwings", "Slot": "Body", + "ArmorValue": 0, + "IsVisible": true, + "Category": "Clothing", "Name": "Devil Wings", "Description": "devilwings", "Prefab": { @@ -10,6 +13,10 @@ "ImageTexture": null, "ImageUrl": "https://cdn.sbox.game/org/zedskipper/devilwings/thumb/51af0358-cba4-4213-8664-98104900638b.png", "MaxCount": 1, + "Rarity": "Common", + "Weight": 1, + "IsStackable": true, + "IsEquipable": true, "__references": [], "__version": 0 } \ No newline at end of file diff --git a/Assets/Items/Cloth/hockeymask.clitem b/Assets/Items/Cloth/hockeymask.clitem index 5b37764..14ca419 100644 --- a/Assets/Items/Cloth/hockeymask.clitem +++ b/Assets/Items/Cloth/hockeymask.clitem @@ -3,7 +3,6 @@ "Slot": "Head", "ArmorValue": 0, "IsVisible": true, - "BodyPart": "", "Category": "Clothing", "Name": "Hockey Mask", "Description": "hockeymask", @@ -16,7 +15,7 @@ "MaxCount": 1, "Rarity": "Common", "Weight": 1, - "IsStackable": false, + "IsStackable": true, "IsEquipable": true, "__references": [], "__version": 0 diff --git a/Assets/Items/Cloth/jetpack.clitem b/Assets/Items/Cloth/jetpack.clitem index 21495e9..05b919b 100644 --- a/Assets/Items/Cloth/jetpack.clitem +++ b/Assets/Items/Cloth/jetpack.clitem @@ -1,6 +1,9 @@ { "ClothUrl": "bitropy/jetpack", "Slot": "Body", + "ArmorValue": 0, + "IsVisible": true, + "Category": "Clothing", "Name": "Jetpack", "Description": "jetpack", "Prefab": { @@ -10,6 +13,10 @@ "ImageTexture": null, "ImageUrl": "https://cdn.sbox.game/asset/bitropy.jetpack/thumb.png.d0b1def606dfc2b7", "MaxCount": 1, + "Rarity": "Common", + "Weight": 1, + "IsStackable": true, + "IsEquipable": true, "__references": [], "__version": 0 } \ No newline at end of file diff --git a/Assets/Items/Cloth/nvg.clitem b/Assets/Items/Cloth/nvg.clitem index b4224ac..abc786f 100644 --- a/Assets/Items/Cloth/nvg.clitem +++ b/Assets/Items/Cloth/nvg.clitem @@ -3,7 +3,6 @@ "Slot": "Head", "ArmorValue": 0, "IsVisible": true, - "BodyPart": "", "Category": "Clothing", "Name": "Night-vision Goggles", "Description": "nvg", @@ -16,7 +15,7 @@ "MaxCount": 1, "Rarity": "Common", "Weight": 1, - "IsStackable": false, + "IsStackable": true, "IsEquipable": true, "__references": [], "__version": 0 diff --git a/Assets/Items/Cloth/poncho2.clitem b/Assets/Items/Cloth/poncho2.clitem index 4f89ae7..fbd6c95 100644 --- a/Assets/Items/Cloth/poncho2.clitem +++ b/Assets/Items/Cloth/poncho2.clitem @@ -1,6 +1,9 @@ { "ClothUrl": "edgyvoxel/poncho2", "Slot": "Body", + "ArmorValue": 0, + "IsVisible": true, + "Category": "Clothing", "Name": "Western Poncho", "Description": "poncho2", "Prefab": { @@ -10,6 +13,10 @@ "ImageTexture": null, "ImageUrl": "https://cdn.sbox.game/org/edgyvoxel/poncho2/thumb/326c9f9b-6b35-478b-b617-f50318173df3.png", "MaxCount": 1, + "Rarity": "Common", + "Weight": 1, + "IsStackable": true, + "IsEquipable": true, "__references": [], "__version": 0 } \ No newline at end of file diff --git a/Assets/Items/Cloth/sfsocks.clitem b/Assets/Items/Cloth/sfsocks.clitem index a050d60..27c5089 100644 --- a/Assets/Items/Cloth/sfsocks.clitem +++ b/Assets/Items/Cloth/sfsocks.clitem @@ -3,7 +3,6 @@ "Slot": "Bottom", "ArmorValue": 0, "IsVisible": true, - "BodyPart": "", "Category": "Clothing", "Name": "Smallfish Socks", "Description": "sfsocks", @@ -16,7 +15,7 @@ "MaxCount": 1, "Rarity": "Common", "Weight": 1, - "IsStackable": false, + "IsStackable": true, "IsEquipable": true, "__references": [], "__version": 0 diff --git a/Assets/Items/Cloth/sleepmask.clitem b/Assets/Items/Cloth/sleepmask.clitem index d9ef0b4..c193bed 100644 --- a/Assets/Items/Cloth/sleepmask.clitem +++ b/Assets/Items/Cloth/sleepmask.clitem @@ -15,6 +15,7 @@ "MaxCount": 1, "Rarity": "Common", "Weight": 1, + "IsStackable": true, "IsEquipable": true, "__references": [], "__version": 0 diff --git a/Assets/Items/Cloth/snowgoggles.clitem b/Assets/Items/Cloth/snowgoggles.clitem index db959c3..44a3430 100644 --- a/Assets/Items/Cloth/snowgoggles.clitem +++ b/Assets/Items/Cloth/snowgoggles.clitem @@ -15,6 +15,7 @@ "MaxCount": 1, "Rarity": "Common", "Weight": 1, + "IsStackable": true, "IsEquipable": true, "__references": [], "__version": 0 diff --git a/Assets/Items/Cloth/thugglasses.clitem b/Assets/Items/Cloth/thugglasses.clitem index 7a1d35a..97637f8 100644 --- a/Assets/Items/Cloth/thugglasses.clitem +++ b/Assets/Items/Cloth/thugglasses.clitem @@ -15,6 +15,7 @@ "MaxCount": 1, "Rarity": "Common", "Weight": 1, + "IsStackable": true, "IsEquipable": true, "__references": [], "__version": 0 diff --git a/Assets/Items/Cloth/weldinggogglesvisorup.clitem b/Assets/Items/Cloth/weldinggogglesvisorup.clitem index 03baa9d..6ddb017 100644 --- a/Assets/Items/Cloth/weldinggogglesvisorup.clitem +++ b/Assets/Items/Cloth/weldinggogglesvisorup.clitem @@ -15,6 +15,7 @@ "MaxCount": 1, "Rarity": "Common", "Weight": 1, + "IsStackable": true, "IsEquipable": true, "__references": [], "__version": 0 diff --git a/Assets/Items/money.inv b/Assets/Items/money.inv new file mode 100644 index 0000000..f35179a --- /dev/null +++ b/Assets/Items/money.inv @@ -0,0 +1,17 @@ +{ + "Name": "Money", + "Description": "", + "Prefab": { + "_type": "gameobject", + "prefab": "prefabs/money.prefab" + }, + "ImageTexture": null, + "ImageUrl": null, + "MaxCount": 1000, + "Category": "Misc", + "Rarity": "Common", + "Weight": 0, + "IsEquipable": false, + "__references": [], + "__version": 0 +} \ No newline at end of file diff --git a/Assets/Items/pistol_test.weapon b/Assets/Items/pistol_test.weapon index 0c4ed9e..52206c3 100644 --- a/Assets/Items/pistol_test.weapon +++ b/Assets/Items/pistol_test.weapon @@ -3,7 +3,7 @@ "HoldType": "Pistol", "WeaponDefinition": { "Position": "-1.108,0.38,-2.367", - "Rotation": "0.002790701,0.01173679,0.006057173,0.9999089", + "Rotation": "0.004714465,-0.05182558,0.03585436,0.9980012", "Scale": "1,1,1" }, "Damage": 10, @@ -26,7 +26,6 @@ "MaxCount": 1, "Rarity": "Common", "Weight": 1, - "IsStackable": false, "IsEquipable": true, "__references": [], "__version": 0 diff --git a/Assets/prefabs/money.prefab b/Assets/prefabs/money.prefab new file mode 100644 index 0000000..c7c4570 --- /dev/null +++ b/Assets/prefabs/money.prefab @@ -0,0 +1,166 @@ +{ + "RootObject": { + "__guid": "ede913e5-78c4-472a-97cf-fe1ca8b0f89b", + "__version": 1, + "Flags": 0, + "Name": "money", + "Position": "0,0,0", + "Rotation": "0,0,0,1", + "Scale": "1,1,1", + "Tags": "", + "Enabled": true, + "NetworkMode": 2, + "NetworkInterpolation": true, + "NetworkOrphaned": 0, + "OwnerTransfer": 1, + "Components": [ + { + "__type": "Sandbox.SkinnedModelRenderer", + "__guid": "ddd0e743-838a-4814-a9bd-51e1b67e3c41", + "__enabled": true, + "AnimationGraph": null, + "BodyGroups": 18446744073709551615, + "BoneMergeTarget": null, + "CreateAttachments": false, + "CreateBoneObjects": false, + "MaterialGroup": null, + "MaterialOverride": null, + "Model": "models/money/batch_clean.vmdl", + "Morphs": {}, + "OnComponentDestroy": null, + "OnComponentDisabled": null, + "OnComponentEnabled": null, + "OnComponentFixedUpdate": null, + "OnComponentStart": null, + "OnComponentUpdate": null, + "Parameters": { + "bools": {}, + "ints": {}, + "floats": {}, + "vectors": {}, + "rotations": {} + }, + "PlaybackRate": 1, + "RenderOptions": { + "GameLayer": true, + "OverlayLayer": false, + "BloomLayer": false, + "AfterUILayer": false + }, + "RenderType": "On", + "Sequence": { + "Name": null, + "Looping": true, + "Blending": false + }, + "Tint": "1,1,1,1", + "UseAnimGraph": true + }, + { + "__type": "Sasalka.InventoryItem", + "__guid": "9642c4b4-d2dd-43e4-afff-017abe42b385", + "__enabled": true, + "Count": 100, + "Definition": "items/money.inv", + "OnComponentDestroy": null, + "OnComponentDisabled": null, + "OnComponentEnabled": null, + "OnComponentFixedUpdate": null, + "OnComponentStart": null, + "OnComponentUpdate": null + }, + { + "__type": "Sasalka.PickupItem", + "__guid": "8016dbcc-2e82-4b6a-9cb3-cf512835d816", + "__enabled": true, + "Label": "E", + "OnComponentDestroy": null, + "OnComponentDisabled": null, + "OnComponentEnabled": null, + "OnComponentFixedUpdate": null, + "OnComponentStart": null, + "OnComponentUpdate": null, + "RequiresHold": false + }, + { + "__type": "Sandbox.Rigidbody", + "__guid": "d5619a12-daf8-4934-a1d0-e3dcf5fd6636", + "__enabled": true, + "AngularDamping": 0, + "Gravity": true, + "LinearDamping": 0, + "Locking": { + "X": false, + "Y": false, + "Z": false, + "Pitch": false, + "Yaw": false, + "Roll": false + }, + "MassCenterOverride": "0,0,0", + "MassOverride": 0, + "MotionEnabled": true, + "OnComponentDestroy": null, + "OnComponentDisabled": null, + "OnComponentEnabled": null, + "OnComponentFixedUpdate": null, + "OnComponentStart": null, + "OnComponentUpdate": null, + "OverrideMassCenter": false, + "RigidbodyFlags": 0, + "StartAsleep": false + }, + { + "__type": "Sandbox.BoxCollider", + "__guid": "2dd6ab10-0ce0-4ab2-9540-1340d1d68ba3", + "__enabled": true, + "Center": "-0.00268507,-0.001428843,0.3951632", + "Friction": null, + "IsTrigger": false, + "OnComponentDestroy": null, + "OnComponentDisabled": null, + "OnComponentEnabled": null, + "OnComponentFixedUpdate": null, + "OnComponentStart": null, + "OnComponentUpdate": null, + "OnObjectTriggerEnter": null, + "OnObjectTriggerExit": null, + "OnTriggerEnter": null, + "OnTriggerExit": null, + "Scale": "2.005365,5.031049,0.819841", + "Static": false, + "Surface": null, + "SurfaceVelocity": "0,0,0" + } + ], + "Children": [], + "__properties": { + "NetworkInterpolation": true, + "TimeScale": 1, + "WantsSystemScene": true, + "Metadata": {}, + "NavMesh": { + "Enabled": false, + "IncludeStaticBodies": true, + "IncludeKeyframedBodies": true, + "EditorAutoUpdate": true, + "AgentHeight": 64, + "AgentRadius": 16, + "AgentStepSize": 18, + "AgentMaxSlope": 40, + "ExcludedBodies": "", + "IncludedBodies": "" + } + }, + "__variables": [] + }, + "ResourceVersion": 2, + "ShowInMenu": false, + "MenuPath": null, + "MenuIcon": null, + "DontBreakAsTemplate": false, + "__references": [ + "opengameartcco.moneybatchclean#95928" + ], + "__version": 2 +} \ No newline at end of file diff --git a/Assets/scenes/test.scene b/Assets/scenes/test.scene index 0ca0087..63df18e 100644 --- a/Assets/scenes/test.scene +++ b/Assets/scenes/test.scene @@ -521,7 +521,7 @@ "IdValue": "e5e018f2-9cad-4ece-b160-ab2aa3aeb7ec" }, "Property": "Position", - "Value": "-208,-8.000023,25.9415" + "Value": "-199.4048,-76.8514,25.9415" } ], "MovedObjects": [] @@ -568,7 +568,7 @@ "IdValue": "e5e018f2-9cad-4ece-b160-ab2aa3aeb7ec" }, "Property": "Position", - "Value": "-208,0,25.9415" + "Value": "-199.4048,-68.85138,25.9415" } ], "MovedObjects": [] @@ -662,7 +662,7 @@ "IdValue": "e5e018f2-9cad-4ece-b160-ab2aa3aeb7ec" }, "Property": "Position", - "Value": "-208,63.99999,25.9415" + "Value": "-201.0861,-63.87533,25.9415" } ], "MovedObjects": [] @@ -709,7 +709,7 @@ "IdValue": "e5e018f2-9cad-4ece-b160-ab2aa3aeb7ec" }, "Property": "Position", - "Value": "-208,55.99998,25.9415" + "Value": "-201.3384,-57.76712,25.9415" } ], "MovedObjects": [] @@ -748,7 +748,7 @@ "IdValue": "dec3b7f3-79ae-4bb4-b868-8de9d0306ebb" }, "Property": "Position", - "Value": "-208,-63.99994,26.12152" + "Value": "-211.8648,-49.46716,26.12149" }, { "Target": { @@ -798,7 +798,7 @@ "IdValue": "dec3b7f3-79ae-4bb4-b868-8de9d0306ebb" }, "Property": "Position", - "Value": "-208,8.000019,26.12152" + "Value": "-198.4965,-48.6568,26.12154" }, { "Target": { @@ -848,7 +848,7 @@ "IdValue": "dec3b7f3-79ae-4bb4-b868-8de9d0306ebb" }, "Property": "Position", - "Value": "-208,72.00002,26.12152" + "Value": "-212.2244,-65.45136,26.12154" }, { "Target": { @@ -5221,32 +5221,6 @@ ], "Children": [] }, - { - "__guid": "b593d08e-1bf7-4ebb-a2ed-bd8ee901d09e", - "__version": 1, - "__Prefab": "prefabs/item_parcel.prefab", - "__PrefabInstancePatch": { - "AddedObjects": [], - "RemovedObjects": [], - "PropertyOverrides": [ - { - "Target": { - "Type": "GameObject", - "IdValue": "0b13f26c-c198-4efc-88df-260d896af36a" - }, - "Property": "Position", - "Value": "160,16,4.069437" - } - ], - "MovedObjects": [] - }, - "__PrefabIdToInstanceId": { - "0b13f26c-c198-4efc-88df-260d896af36a": "b593d08e-1bf7-4ebb-a2ed-bd8ee901d09e", - "80b52707-c81d-47fa-bab7-4be48f2d75a4": "2150cd49-a27c-462f-a7ea-ead17e42f6d6", - "c888eaab-cb05-4469-bf5f-7c23ede5c25f": "799f4a0c-f42b-46e6-ba2b-44de0a85255e", - "a90f059e-5c0a-4122-b742-9dd12e5d8494": "d14d3f67-52e9-4ff1-9348-66990b170c0f" - } - }, { "__guid": "2499dcc5-fb26-4924-b563-6ecb05df2dc3", "__version": 1, @@ -5308,7 +5282,7 @@ "IdValue": "ce810e36-c1c4-4ea3-be56-46c1d13e5273" }, "Property": "Position", - "Value": "-208.9104,-39.05935,26.00336" + "Value": "-202.7712,16.93332,26.00335" }, { "Target": { @@ -5316,7 +5290,7 @@ "IdValue": "ce810e36-c1c4-4ea3-be56-46c1d13e5273" }, "Property": "Rotation", - "Value": "0.7071067,0,0,0.7071068" + "Value": "0.4999999,-0.5,-0.4999999,0.5" } ], "MovedObjects": [] @@ -5355,7 +5329,7 @@ "IdValue": "ce810e36-c1c4-4ea3-be56-46c1d13e5273" }, "Property": "Position", - "Value": "-209.404,51.58465,26.00338" + "Value": "-199.9064,0.0620842,26.00339" }, { "Target": { @@ -5363,7 +5337,7 @@ "IdValue": "ce810e36-c1c4-4ea3-be56-46c1d13e5273" }, "Property": "Rotation", - "Value": "0.7071067,0,0,0.7071068" + "Value": "0.6532815,-0.2705981,-0.270598,0.6532816" } ], "MovedObjects": [] @@ -5394,7 +5368,7 @@ "IdValue": "4ff6f615-319d-4ec0-a44e-b41f043aba92" }, "Property": "Position", - "Value": "-217.1469,-5.468893,25.56124" + "Value": "-217.1469,3.614922,25.56124" }, { "Target": { @@ -5438,7 +5412,7 @@ "IdValue": "4ff6f615-319d-4ec0-a44e-b41f043aba92" }, "Property": "Position", - "Value": "-199.6675,16.48223,25.56122" + "Value": "-217.3513,-8.875927,25.56122" } ], "MovedObjects": [] @@ -5474,7 +5448,7 @@ "IdValue": "4ff6f615-319d-4ec0-a44e-b41f043aba92" }, "Property": "Position", - "Value": "-198.7243,80.48689,25.56121" + "Value": "-217.1863,16.7243,25.56121" } ], "MovedObjects": [] @@ -5540,7 +5514,15 @@ "IdValue": "ce810e36-c1c4-4ea3-be56-46c1d13e5273" }, "Property": "Position", - "Value": "-160,0,3.65008" + "Value": "-197.0617,13.54843,27.3784" + }, + { + "Target": { + "Type": "GameObject", + "IdValue": "ce810e36-c1c4-4ea3-be56-46c1d13e5273" + }, + "Property": "Rotation", + "Value": "0.3535534,-0.3535533,-0.6123724,0.6123725" } ], "MovedObjects": [ @@ -5573,6 +5555,710 @@ "cff6f843-9ace-46d0-b3bf-cf882762b913": "8fecfa58-c7fb-445e-8e74-ad3dd151c024", "d0fd09c4-795e-48f1-a8e0-d842e34a08b4": "b5030d94-b7ba-4836-84d6-a89385426682" } + }, + { + "__guid": "21928ee3-f59d-4d6b-914a-0d0dc4eb7014", + "__version": 1, + "__Prefab": "prefabs/money.prefab", + "__PrefabInstancePatch": { + "AddedObjects": [], + "RemovedObjects": [], + "PropertyOverrides": [ + { + "Target": { + "Type": "GameObject", + "IdValue": "ede913e5-78c4-472a-97cf-fe1ca8b0f89b" + }, + "Property": "Position", + "Value": "-197.9586,41.73938,25.8142" + } + ], + "MovedObjects": [] + }, + "__PrefabIdToInstanceId": { + "ede913e5-78c4-472a-97cf-fe1ca8b0f89b": "21928ee3-f59d-4d6b-914a-0d0dc4eb7014", + "ddd0e743-838a-4814-a9bd-51e1b67e3c41": "d8d05e30-42f2-4334-9a31-a19d168a217d", + "3b63fdcd-1087-45bb-931a-034821382897": "a17fd6ea-291f-49dd-b336-8dd492129662", + "9642c4b4-d2dd-43e4-afff-017abe42b385": "7f219f9f-c6aa-4e5e-90e4-ff2709b036d0" + } + }, + { + "__guid": "1556376e-e7fa-4add-aeda-b48ea6db27be", + "__version": 1, + "__Prefab": "prefabs/money.prefab", + "__PrefabInstancePatch": { + "AddedObjects": [], + "RemovedObjects": [], + "PropertyOverrides": [ + { + "Target": { + "Type": "GameObject", + "IdValue": "ede913e5-78c4-472a-97cf-fe1ca8b0f89b" + }, + "Property": "Name", + "Value": "money (7)" + }, + { + "Target": { + "Type": "GameObject", + "IdValue": "ede913e5-78c4-472a-97cf-fe1ca8b0f89b" + }, + "Property": "Position", + "Value": "-203.2569,43.6021,25.8142" + } + ], + "MovedObjects": [] + }, + "__PrefabIdToInstanceId": { + "ede913e5-78c4-472a-97cf-fe1ca8b0f89b": "1556376e-e7fa-4add-aeda-b48ea6db27be", + "ddd0e743-838a-4814-a9bd-51e1b67e3c41": "c5025565-c55a-4b70-a4af-22152abd25a4", + "3b63fdcd-1087-45bb-931a-034821382897": "10b783b6-4a9d-4a0e-8efe-a51de298f1d8", + "9642c4b4-d2dd-43e4-afff-017abe42b385": "fd0dc491-afbb-4376-a7dc-d6deaa6eac11" + } + }, + { + "__guid": "43b4bdcc-7731-4cce-9d32-0fa5bc6963d0", + "__version": 1, + "__Prefab": "prefabs/money.prefab", + "__PrefabInstancePatch": { + "AddedObjects": [], + "RemovedObjects": [], + "PropertyOverrides": [ + { + "Target": { + "Type": "GameObject", + "IdValue": "ede913e5-78c4-472a-97cf-fe1ca8b0f89b" + }, + "Property": "Name", + "Value": "money (11)" + }, + { + "Target": { + "Type": "GameObject", + "IdValue": "ede913e5-78c4-472a-97cf-fe1ca8b0f89b" + }, + "Property": "Position", + "Value": "-208.2466,45.03207,25.8142" + } + ], + "MovedObjects": [] + }, + "__PrefabIdToInstanceId": { + "ede913e5-78c4-472a-97cf-fe1ca8b0f89b": "43b4bdcc-7731-4cce-9d32-0fa5bc6963d0", + "ddd0e743-838a-4814-a9bd-51e1b67e3c41": "2df8e036-5b8f-4c88-9e87-9b34f6a06f72", + "3b63fdcd-1087-45bb-931a-034821382897": "e27b830e-f68c-431d-ab4f-486f076a4e38", + "9642c4b4-d2dd-43e4-afff-017abe42b385": "cad6a04c-9427-4318-a7d0-4b4128d44eea" + } + }, + { + "__guid": "a8f9b7a0-40fb-4b19-8552-0edd9f305fc4", + "__version": 1, + "__Prefab": "prefabs/money.prefab", + "__PrefabInstancePatch": { + "AddedObjects": [], + "RemovedObjects": [], + "PropertyOverrides": [ + { + "Target": { + "Type": "GameObject", + "IdValue": "ede913e5-78c4-472a-97cf-fe1ca8b0f89b" + }, + "Property": "Name", + "Value": "money (15)" + }, + { + "Target": { + "Type": "GameObject", + "IdValue": "ede913e5-78c4-472a-97cf-fe1ca8b0f89b" + }, + "Property": "Position", + "Value": "-213.5308,47.4015,25.8142" + } + ], + "MovedObjects": [] + }, + "__PrefabIdToInstanceId": { + "ede913e5-78c4-472a-97cf-fe1ca8b0f89b": "a8f9b7a0-40fb-4b19-8552-0edd9f305fc4", + "ddd0e743-838a-4814-a9bd-51e1b67e3c41": "909ac0de-23d9-4e7d-be09-40005381f74f", + "3b63fdcd-1087-45bb-931a-034821382897": "ae0fccca-7da8-461f-baa1-78ebaba00760", + "9642c4b4-d2dd-43e4-afff-017abe42b385": "6842e5f9-eccd-4d3c-b6cd-85a1929f8736" + } + }, + { + "__guid": "22992bbd-6ad3-406e-9a84-fdaca8c3f255", + "__version": 1, + "__Prefab": "prefabs/money.prefab", + "__PrefabInstancePatch": { + "AddedObjects": [], + "RemovedObjects": [], + "PropertyOverrides": [ + { + "Target": { + "Type": "GameObject", + "IdValue": "ede913e5-78c4-472a-97cf-fe1ca8b0f89b" + }, + "Property": "Name", + "Value": "money (19)" + }, + { + "Target": { + "Type": "GameObject", + "IdValue": "ede913e5-78c4-472a-97cf-fe1ca8b0f89b" + }, + "Property": "Position", + "Value": "-200.2111,72.35561,25.8142" + }, + { + "Target": { + "Type": "GameObject", + "IdValue": "ede913e5-78c4-472a-97cf-fe1ca8b0f89b" + }, + "Property": "Rotation", + "Value": "0,0,0.3826834,0.9238796" + } + ], + "MovedObjects": [] + }, + "__PrefabIdToInstanceId": { + "ede913e5-78c4-472a-97cf-fe1ca8b0f89b": "22992bbd-6ad3-406e-9a84-fdaca8c3f255", + "ddd0e743-838a-4814-a9bd-51e1b67e3c41": "6bb6367c-9bd6-455a-a44b-e1a2f17b0fbf", + "3b63fdcd-1087-45bb-931a-034821382897": "5d02f7cc-3cac-4900-aa8d-77d8cb33efa0", + "9642c4b4-d2dd-43e4-afff-017abe42b385": "bc1490d8-1100-4ba5-8243-9cb89718742d" + } + }, + { + "__guid": "e7c3eb1d-63da-4984-83f8-0a58271b4535", + "__version": 1, + "__Prefab": "prefabs/money.prefab", + "__PrefabInstancePatch": { + "AddedObjects": [], + "RemovedObjects": [], + "PropertyOverrides": [ + { + "Target": { + "Type": "GameObject", + "IdValue": "ede913e5-78c4-472a-97cf-fe1ca8b0f89b" + }, + "Property": "Name", + "Value": "money (1)" + }, + { + "Target": { + "Type": "GameObject", + "IdValue": "ede913e5-78c4-472a-97cf-fe1ca8b0f89b" + }, + "Property": "Position", + "Value": "-197.9668,48.77445,25.8142" + } + ], + "MovedObjects": [] + }, + "__PrefabIdToInstanceId": { + "ede913e5-78c4-472a-97cf-fe1ca8b0f89b": "e7c3eb1d-63da-4984-83f8-0a58271b4535", + "ddd0e743-838a-4814-a9bd-51e1b67e3c41": "a98f9db0-ff5b-470d-80c9-238167df71cc", + "3b63fdcd-1087-45bb-931a-034821382897": "169b8354-e04f-423a-a9b6-61819457820f", + "9642c4b4-d2dd-43e4-afff-017abe42b385": "c8308e97-e1f5-4751-be76-78629f242de6" + } + }, + { + "__guid": "fdf733d0-3b84-4328-bcec-c4b966a24ca4", + "__version": 1, + "__Prefab": "prefabs/money.prefab", + "__PrefabInstancePatch": { + "AddedObjects": [], + "RemovedObjects": [], + "PropertyOverrides": [ + { + "Target": { + "Type": "GameObject", + "IdValue": "ede913e5-78c4-472a-97cf-fe1ca8b0f89b" + }, + "Property": "Name", + "Value": "money (6)" + }, + { + "Target": { + "Type": "GameObject", + "IdValue": "ede913e5-78c4-472a-97cf-fe1ca8b0f89b" + }, + "Property": "Position", + "Value": "-203.2651,50.63717,25.8142" + } + ], + "MovedObjects": [] + }, + "__PrefabIdToInstanceId": { + "ede913e5-78c4-472a-97cf-fe1ca8b0f89b": "fdf733d0-3b84-4328-bcec-c4b966a24ca4", + "ddd0e743-838a-4814-a9bd-51e1b67e3c41": "b28b991a-86f2-4301-af89-a4c50f8f55cd", + "3b63fdcd-1087-45bb-931a-034821382897": "dee5544e-58e4-4e7d-8eba-009e70dc10f8", + "9642c4b4-d2dd-43e4-afff-017abe42b385": "349c3efc-0619-4348-8c45-91c8d2ea82dd" + } + }, + { + "__guid": "c4c73f35-18eb-442a-918b-ea3cb6fba3c5", + "__version": 1, + "__Prefab": "prefabs/money.prefab", + "__PrefabInstancePatch": { + "AddedObjects": [], + "RemovedObjects": [], + "PropertyOverrides": [ + { + "Target": { + "Type": "GameObject", + "IdValue": "ede913e5-78c4-472a-97cf-fe1ca8b0f89b" + }, + "Property": "Name", + "Value": "money (10)" + }, + { + "Target": { + "Type": "GameObject", + "IdValue": "ede913e5-78c4-472a-97cf-fe1ca8b0f89b" + }, + "Property": "Position", + "Value": "-208.2548,52.06713,25.8142" + } + ], + "MovedObjects": [] + }, + "__PrefabIdToInstanceId": { + "ede913e5-78c4-472a-97cf-fe1ca8b0f89b": "c4c73f35-18eb-442a-918b-ea3cb6fba3c5", + "ddd0e743-838a-4814-a9bd-51e1b67e3c41": "6c838a96-a791-4a29-82a1-0a7c43cfa38c", + "3b63fdcd-1087-45bb-931a-034821382897": "cc3e8829-ac50-42d8-84d4-10b3a71d747d", + "9642c4b4-d2dd-43e4-afff-017abe42b385": "ea86e30b-516b-4771-a8e5-b6a1b2d8ba27" + } + }, + { + "__guid": "0763e440-9bb1-4366-96ce-5bb3c7eb6d6c", + "__version": 1, + "__Prefab": "prefabs/money.prefab", + "__PrefabInstancePatch": { + "AddedObjects": [], + "RemovedObjects": [], + "PropertyOverrides": [ + { + "Target": { + "Type": "GameObject", + "IdValue": "ede913e5-78c4-472a-97cf-fe1ca8b0f89b" + }, + "Property": "Name", + "Value": "money (14)" + }, + { + "Target": { + "Type": "GameObject", + "IdValue": "ede913e5-78c4-472a-97cf-fe1ca8b0f89b" + }, + "Property": "Position", + "Value": "-213.539,54.43657,25.8142" + } + ], + "MovedObjects": [] + }, + "__PrefabIdToInstanceId": { + "ede913e5-78c4-472a-97cf-fe1ca8b0f89b": "0763e440-9bb1-4366-96ce-5bb3c7eb6d6c", + "ddd0e743-838a-4814-a9bd-51e1b67e3c41": "4167419f-c132-4658-810a-74eaddcaee14", + "3b63fdcd-1087-45bb-931a-034821382897": "ca54e345-4f3a-476b-a870-1c79981386de", + "9642c4b4-d2dd-43e4-afff-017abe42b385": "3df8e774-900f-4039-beac-3833d54f2762" + } + }, + { + "__guid": "c3994300-90b2-4c36-b91a-3532797e10aa", + "__version": 1, + "__Prefab": "prefabs/money.prefab", + "__PrefabInstancePatch": { + "AddedObjects": [], + "RemovedObjects": [], + "PropertyOverrides": [ + { + "Target": { + "Type": "GameObject", + "IdValue": "ede913e5-78c4-472a-97cf-fe1ca8b0f89b" + }, + "Property": "Name", + "Value": "money (18)" + }, + { + "Target": { + "Type": "GameObject", + "IdValue": "ede913e5-78c4-472a-97cf-fe1ca8b0f89b" + }, + "Property": "Position", + "Value": "-205.1914,77.32437,25.8142" + }, + { + "Target": { + "Type": "GameObject", + "IdValue": "ede913e5-78c4-472a-97cf-fe1ca8b0f89b" + }, + "Property": "Rotation", + "Value": "0,0,0.3826834,0.9238796" + } + ], + "MovedObjects": [] + }, + "__PrefabIdToInstanceId": { + "ede913e5-78c4-472a-97cf-fe1ca8b0f89b": "c3994300-90b2-4c36-b91a-3532797e10aa", + "ddd0e743-838a-4814-a9bd-51e1b67e3c41": "668bbe22-901c-4e0f-8365-5e9e3f13219b", + "3b63fdcd-1087-45bb-931a-034821382897": "8827af6b-642f-42d4-9c98-a18f86da1b08", + "9642c4b4-d2dd-43e4-afff-017abe42b385": "c59cb7d2-cba1-4fc7-836e-982c342028e7" + } + }, + { + "__guid": "7630c4e2-deda-430e-bb73-44b5ec53710d", + "__version": 1, + "__Prefab": "prefabs/money.prefab", + "__PrefabInstancePatch": { + "AddedObjects": [], + "RemovedObjects": [], + "PropertyOverrides": [ + { + "Target": { + "Type": "GameObject", + "IdValue": "ede913e5-78c4-472a-97cf-fe1ca8b0f89b" + }, + "Property": "Name", + "Value": "money (2)" + }, + { + "Target": { + "Type": "GameObject", + "IdValue": "ede913e5-78c4-472a-97cf-fe1ca8b0f89b" + }, + "Property": "Position", + "Value": "-198.163,56.22728,25.8142" + } + ], + "MovedObjects": [] + }, + "__PrefabIdToInstanceId": { + "ede913e5-78c4-472a-97cf-fe1ca8b0f89b": "7630c4e2-deda-430e-bb73-44b5ec53710d", + "ddd0e743-838a-4814-a9bd-51e1b67e3c41": "705f37fd-7c77-45e4-800f-ead4d5b56259", + "3b63fdcd-1087-45bb-931a-034821382897": "6ad1a817-1c33-4c3c-ada2-69ef8a1dd627", + "9642c4b4-d2dd-43e4-afff-017abe42b385": "d99133e7-4b09-42ea-bc08-47b5f85b6bac" + } + }, + { + "__guid": "a7d6aa23-b1c8-43a0-8e14-b32e3d33bd29", + "__version": 1, + "__Prefab": "prefabs/money.prefab", + "__PrefabInstancePatch": { + "AddedObjects": [], + "RemovedObjects": [], + "PropertyOverrides": [ + { + "Target": { + "Type": "GameObject", + "IdValue": "ede913e5-78c4-472a-97cf-fe1ca8b0f89b" + }, + "Property": "Name", + "Value": "money (5)" + }, + { + "Target": { + "Type": "GameObject", + "IdValue": "ede913e5-78c4-472a-97cf-fe1ca8b0f89b" + }, + "Property": "Position", + "Value": "-203.4612,58.09,25.8142" + } + ], + "MovedObjects": [] + }, + "__PrefabIdToInstanceId": { + "ede913e5-78c4-472a-97cf-fe1ca8b0f89b": "a7d6aa23-b1c8-43a0-8e14-b32e3d33bd29", + "ddd0e743-838a-4814-a9bd-51e1b67e3c41": "cb875277-f8ae-482e-bf88-dd6b09417565", + "3b63fdcd-1087-45bb-931a-034821382897": "5d9a117a-ee7d-4b54-a1de-075bb2923d39", + "9642c4b4-d2dd-43e4-afff-017abe42b385": "69a1a496-610f-4c42-ade3-d9a569c38c9d" + } + }, + { + "__guid": "871ba48c-6ace-4798-b9ce-843c151bb3b7", + "__version": 1, + "__Prefab": "prefabs/money.prefab", + "__PrefabInstancePatch": { + "AddedObjects": [], + "RemovedObjects": [], + "PropertyOverrides": [ + { + "Target": { + "Type": "GameObject", + "IdValue": "ede913e5-78c4-472a-97cf-fe1ca8b0f89b" + }, + "Property": "Name", + "Value": "money (9)" + }, + { + "Target": { + "Type": "GameObject", + "IdValue": "ede913e5-78c4-472a-97cf-fe1ca8b0f89b" + }, + "Property": "Position", + "Value": "-208.4509,59.51996,25.8142" + } + ], + "MovedObjects": [] + }, + "__PrefabIdToInstanceId": { + "ede913e5-78c4-472a-97cf-fe1ca8b0f89b": "871ba48c-6ace-4798-b9ce-843c151bb3b7", + "ddd0e743-838a-4814-a9bd-51e1b67e3c41": "a5b92516-eef5-45f7-8408-1d2c16fac85d", + "3b63fdcd-1087-45bb-931a-034821382897": "0712061b-c9cf-43fe-8e95-9fd26f0e9515", + "9642c4b4-d2dd-43e4-afff-017abe42b385": "237e16d5-fd87-4bee-b40b-ce02e00d4069" + } + }, + { + "__guid": "1db22034-cf25-45c2-9da3-63dc1b0806d4", + "__version": 1, + "__Prefab": "prefabs/money.prefab", + "__PrefabInstancePatch": { + "AddedObjects": [], + "RemovedObjects": [], + "PropertyOverrides": [ + { + "Target": { + "Type": "GameObject", + "IdValue": "ede913e5-78c4-472a-97cf-fe1ca8b0f89b" + }, + "Property": "Name", + "Value": "money (13)" + }, + { + "Target": { + "Type": "GameObject", + "IdValue": "ede913e5-78c4-472a-97cf-fe1ca8b0f89b" + }, + "Property": "Position", + "Value": "-213.7352,61.8894,25.8142" + } + ], + "MovedObjects": [] + }, + "__PrefabIdToInstanceId": { + "ede913e5-78c4-472a-97cf-fe1ca8b0f89b": "1db22034-cf25-45c2-9da3-63dc1b0806d4", + "ddd0e743-838a-4814-a9bd-51e1b67e3c41": "a4ec28fe-00b4-43e7-aeaa-ca6e31de676f", + "3b63fdcd-1087-45bb-931a-034821382897": "8adb3869-429d-4ac0-b3c8-23630281486b", + "9642c4b4-d2dd-43e4-afff-017abe42b385": "7e7ea45c-1778-4a7b-91b9-b07c86c50ef4" + } + }, + { + "__guid": "96e7deb9-7fc2-4042-b1c7-638ead79a375", + "__version": 1, + "__Prefab": "prefabs/money.prefab", + "__PrefabInstancePatch": { + "AddedObjects": [], + "RemovedObjects": [], + "PropertyOverrides": [ + { + "Target": { + "Type": "GameObject", + "IdValue": "ede913e5-78c4-472a-97cf-fe1ca8b0f89b" + }, + "Property": "Name", + "Value": "money (17)" + }, + { + "Target": { + "Type": "GameObject", + "IdValue": "ede913e5-78c4-472a-97cf-fe1ca8b0f89b" + }, + "Property": "Position", + "Value": "-210.6001,82.4556,25.8142" + }, + { + "Target": { + "Type": "GameObject", + "IdValue": "ede913e5-78c4-472a-97cf-fe1ca8b0f89b" + }, + "Property": "Rotation", + "Value": "0,0,0.3826834,0.9238796" + } + ], + "MovedObjects": [] + }, + "__PrefabIdToInstanceId": { + "ede913e5-78c4-472a-97cf-fe1ca8b0f89b": "96e7deb9-7fc2-4042-b1c7-638ead79a375", + "ddd0e743-838a-4814-a9bd-51e1b67e3c41": "4590e9a6-cd2c-45c5-bab5-34f9db4c9e0b", + "3b63fdcd-1087-45bb-931a-034821382897": "5b3844f3-6685-4133-b261-11e9016bbd90", + "9642c4b4-d2dd-43e4-afff-017abe42b385": "a89e38fd-c5f8-4d03-a245-b334f9f2d62c" + } + }, + { + "__guid": "3c6dd779-0b4b-4104-bed7-c2fc8252fd6b", + "__version": 1, + "__Prefab": "prefabs/money.prefab", + "__PrefabInstancePatch": { + "AddedObjects": [], + "RemovedObjects": [], + "PropertyOverrides": [ + { + "Target": { + "Type": "GameObject", + "IdValue": "ede913e5-78c4-472a-97cf-fe1ca8b0f89b" + }, + "Property": "Name", + "Value": "money (3)" + }, + { + "Target": { + "Type": "GameObject", + "IdValue": "ede913e5-78c4-472a-97cf-fe1ca8b0f89b" + }, + "Property": "Position", + "Value": "-198.0119,63.56533,25.8142" + } + ], + "MovedObjects": [] + }, + "__PrefabIdToInstanceId": { + "ede913e5-78c4-472a-97cf-fe1ca8b0f89b": "3c6dd779-0b4b-4104-bed7-c2fc8252fd6b", + "ddd0e743-838a-4814-a9bd-51e1b67e3c41": "ec15c1a0-c73c-448f-8157-5fc988d96c4f", + "3b63fdcd-1087-45bb-931a-034821382897": "9696a696-9cee-4102-84a9-f02657e96fa9", + "9642c4b4-d2dd-43e4-afff-017abe42b385": "b9ac64d0-d0fd-4945-8327-bec3e7cbe0a4" + } + }, + { + "__guid": "1aa01b1c-8ba1-4afb-b1ca-3772939ca40c", + "__version": 1, + "__Prefab": "prefabs/money.prefab", + "__PrefabInstancePatch": { + "AddedObjects": [], + "RemovedObjects": [], + "PropertyOverrides": [ + { + "Target": { + "Type": "GameObject", + "IdValue": "ede913e5-78c4-472a-97cf-fe1ca8b0f89b" + }, + "Property": "Name", + "Value": "money (4)" + }, + { + "Target": { + "Type": "GameObject", + "IdValue": "ede913e5-78c4-472a-97cf-fe1ca8b0f89b" + }, + "Property": "Position", + "Value": "-203.3102,65.42805,25.8142" + } + ], + "MovedObjects": [] + }, + "__PrefabIdToInstanceId": { + "ede913e5-78c4-472a-97cf-fe1ca8b0f89b": "1aa01b1c-8ba1-4afb-b1ca-3772939ca40c", + "ddd0e743-838a-4814-a9bd-51e1b67e3c41": "bd6eb13c-7d33-43ed-9827-a11cfecf82b3", + "3b63fdcd-1087-45bb-931a-034821382897": "550a46ce-8dfb-4411-8ded-78891c7d3c7c", + "9642c4b4-d2dd-43e4-afff-017abe42b385": "36581dc8-3bdf-42e0-b116-7fe786bee953" + } + }, + { + "__guid": "f2922cce-5af9-4168-bad8-f553189d2b86", + "__version": 1, + "__Prefab": "prefabs/money.prefab", + "__PrefabInstancePatch": { + "AddedObjects": [], + "RemovedObjects": [], + "PropertyOverrides": [ + { + "Target": { + "Type": "GameObject", + "IdValue": "ede913e5-78c4-472a-97cf-fe1ca8b0f89b" + }, + "Property": "Name", + "Value": "money (8)" + }, + { + "Target": { + "Type": "GameObject", + "IdValue": "ede913e5-78c4-472a-97cf-fe1ca8b0f89b" + }, + "Property": "Position", + "Value": "-208.2998,66.85802,25.8142" + } + ], + "MovedObjects": [] + }, + "__PrefabIdToInstanceId": { + "ede913e5-78c4-472a-97cf-fe1ca8b0f89b": "f2922cce-5af9-4168-bad8-f553189d2b86", + "ddd0e743-838a-4814-a9bd-51e1b67e3c41": "e512d440-220a-45ae-8bcd-dcf15015a603", + "3b63fdcd-1087-45bb-931a-034821382897": "28859b9c-a8fd-44c5-b602-f5b34a91189f", + "9642c4b4-d2dd-43e4-afff-017abe42b385": "faed5a74-558c-4ef6-b539-d2deccdd26b3" + } + }, + { + "__guid": "f16c70f6-1138-4a87-8bf2-159c840e776e", + "__version": 1, + "__Prefab": "prefabs/money.prefab", + "__PrefabInstancePatch": { + "AddedObjects": [], + "RemovedObjects": [], + "PropertyOverrides": [ + { + "Target": { + "Type": "GameObject", + "IdValue": "ede913e5-78c4-472a-97cf-fe1ca8b0f89b" + }, + "Property": "Name", + "Value": "money (12)" + }, + { + "Target": { + "Type": "GameObject", + "IdValue": "ede913e5-78c4-472a-97cf-fe1ca8b0f89b" + }, + "Property": "Position", + "Value": "-213.5841,69.22745,25.8142" + } + ], + "MovedObjects": [] + }, + "__PrefabIdToInstanceId": { + "ede913e5-78c4-472a-97cf-fe1ca8b0f89b": "f16c70f6-1138-4a87-8bf2-159c840e776e", + "ddd0e743-838a-4814-a9bd-51e1b67e3c41": "e2b0dcb9-bfb6-47b6-8551-f76d4e9ed7ee", + "3b63fdcd-1087-45bb-931a-034821382897": "53df607e-ed90-4e3e-aff7-619c159c3119", + "9642c4b4-d2dd-43e4-afff-017abe42b385": "be03faae-cee5-4c7e-911b-6a48c11901b8" + } + }, + { + "__guid": "a13d5d20-0760-400e-bdd0-3e35dfb5cc6d", + "__version": 1, + "__Prefab": "prefabs/money.prefab", + "__PrefabInstancePatch": { + "AddedObjects": [], + "RemovedObjects": [], + "PropertyOverrides": [ + { + "Target": { + "Type": "GameObject", + "IdValue": "ede913e5-78c4-472a-97cf-fe1ca8b0f89b" + }, + "Property": "Name", + "Value": "money (16)" + }, + { + "Target": { + "Type": "GameObject", + "IdValue": "ede913e5-78c4-472a-97cf-fe1ca8b0f89b" + }, + "Property": "Position", + "Value": "-215.682,87.75123,25.8142" + }, + { + "Target": { + "Type": "GameObject", + "IdValue": "ede913e5-78c4-472a-97cf-fe1ca8b0f89b" + }, + "Property": "Rotation", + "Value": "0,0,0.3826834,0.9238796" + } + ], + "MovedObjects": [] + }, + "__PrefabIdToInstanceId": { + "ede913e5-78c4-472a-97cf-fe1ca8b0f89b": "a13d5d20-0760-400e-bdd0-3e35dfb5cc6d", + "ddd0e743-838a-4814-a9bd-51e1b67e3c41": "1c125825-4c7e-4346-ac40-1a3ace86c56d", + "3b63fdcd-1087-45bb-931a-034821382897": "aa8af4bd-fb84-4950-998e-e5f3d7e160d4", + "9642c4b4-d2dd-43e4-afff-017abe42b385": "13ce2929-18f7-416e-87bf-f9b486b4a185" + } } ], "SceneProperties": { diff --git a/Code/Inventory/Definitions/WeaponItemDefinition.cs b/Code/Inventory/Definitions/WeaponItemDefinition.cs index 5c735eb..67e97a2 100644 --- a/Code/Inventory/Definitions/WeaponItemDefinition.cs +++ b/Code/Inventory/Definitions/WeaponItemDefinition.cs @@ -57,7 +57,7 @@ public struct WeaponDefinition [Property] public Rotation Rotation { get; set; } - [Property] public Vector3 Scale { get; set; } + [Property] public Vector3 Scale { get; set; } = new Vector3( 1, 1, 1 ); public WeaponDefinition() { diff --git a/Code/Player/Dedugan.Camera.cs b/Code/Player/Dedugan.Camera.cs index 951706d..95875b5 100644 --- a/Code/Player/Dedugan.Camera.cs +++ b/Code/Player/Dedugan.Camera.cs @@ -7,9 +7,13 @@ public sealed partial class Dedugan if ( RagdollController.Enabled ) { var off = RagdollController.WorldRotation.Up * 20f - Camera.WorldRotation.Forward * 200f; - Camera.WorldPosition = Vector3.Lerp( Camera.WorldPosition, RagdollController.WorldPosition + off, - Time.Delta * 5f ); - Camera.LocalRotation = Rotation.Lerp( Camera.LocalRotation, EyeAngles.ToRotation(), Time.Delta * 2f ); + // Camera.WorldPosition = Vector3.Lerp( Camera.WorldPosition, RagdollController.WorldPosition + off, + // Time.Delta * 5f ); + // Camera.LocalRotation = Rotation.Lerp( Camera.LocalRotation, EyeAngles.ToRotation(), Time.Delta * 2f ); + CameraPivot.WorldPosition = RagdollController.WorldPosition + off; + // Vector3.Lerp( CameraPivot.WorldPosition, RagdollController.WorldPosition + off, Time.Delta * 25f ); + CameraPivot.LocalRotation = EyeAngles.ToRotation(); + //Rotation.Lerp( CameraPivot.LocalRotation, EyeAngles.ToRotation(), Time.Delta * 25f ); } else {