This commit is contained in:
brausjonas
2023-04-14 23:39:49 +02:00
parent ad480a3076
commit 59b80c0ab2
17 changed files with 180 additions and 58 deletions
+1 -1
View File
@@ -165,7 +165,7 @@
<workItem from="1680813239896" duration="4155000" />
<workItem from="1681056387914" duration="882000" />
<workItem from="1681415672515" duration="5000" />
<workItem from="1681479671396" duration="10742000" />
<workItem from="1681479671396" duration="11567000" />
</task>
<servers />
</component>
+8
View File
@@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: eac5f2d16d05ad94d8de10b44b782019
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
@@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 5d40375ecfcdc4848a7022cbf6f039d4
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
Binary file not shown.
@@ -31,7 +31,36 @@ ModelImporter:
animationWrapMode: 0
extraExposedTransformPaths: []
extraUserProperties: []
clipAnimations: []
clipAnimations:
- serializedVersion: 16
name: Scene
takeName: Scene
internalID: -623603649343465320
firstFrame: 1
lastFrame: 119
wrapMode: 0
orientationOffsetY: 0
level: 0
cycleOffset: 0
loop: 0
hasAdditiveReferencePose: 0
loopTime: 1
loopBlend: 0
loopBlendOrientation: 0
loopBlendPositionY: 0
loopBlendPositionXZ: 0
keepOriginalOrientation: 0
keepOriginalPositionY: 1
keepOriginalPositionXZ: 0
heightFromFeet: 0
mirror: 0
bodyMask: 01000000010000000100000001000000010000000100000001000000010000000100000001000000010000000100000001000000
curves: []
events: []
transformMask: []
maskType: 3
maskSource: {instanceID: 0}
additiveReferencePoseFrame: 1
isReadable: 0
meshes:
lODScreenPercentages: []
Binary file not shown.
Binary file not shown.
@@ -31,7 +31,36 @@ ModelImporter:
animationWrapMode: 0
extraExposedTransformPaths: []
extraUserProperties: []
clipAnimations: []
clipAnimations:
- serializedVersion: 16
name: Scene
takeName: Scene
internalID: -623603649343465320
firstFrame: 1
lastFrame: 119
wrapMode: 0
orientationOffsetY: 0
level: 0
cycleOffset: 0
loop: 0
hasAdditiveReferencePose: 0
loopTime: 1
loopBlend: 0
loopBlendOrientation: 0
loopBlendPositionY: 0
loopBlendPositionXZ: 0
keepOriginalOrientation: 0
keepOriginalPositionY: 1
keepOriginalPositionXZ: 0
heightFromFeet: 0
mirror: 0
bodyMask: 01000000010000000100000001000000010000000100000001000000010000000100000001000000010000000100000001000000
curves: []
events: []
transformMask: []
maskType: 3
maskSource: {instanceID: 0}
additiveReferencePoseFrame: 1
isReadable: 0
meshes:
lODScreenPercentages: []
Binary file not shown.
@@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 1933d9b5ee8e4de4f836abfe69d80465
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
Binary file not shown.
+21
View File
@@ -11,6 +11,7 @@ GameObject:
- component: {fileID: 7476016153201905786}
- component: {fileID: 5796131078349627359}
- component: {fileID: 8613989468060347157}
- component: {fileID: 4436161057020169518}
m_Layer: 0
m_Name: NewPalm
m_TagString: Untagged
@@ -84,3 +85,23 @@ MeshRenderer:
m_SortingLayer: 0
m_SortingOrder: 0
m_AdditionalVertexStreams: {fileID: 0}
--- !u!95 &4436161057020169518
Animator:
serializedVersion: 5
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7821615350362852032}
m_Enabled: 1
m_Avatar: {fileID: 0}
m_Controller: {fileID: 9100000, guid: ee01a9cf2faa8c848a35e876a883071f, type: 2}
m_CullingMode: 0
m_UpdateMode: 0
m_ApplyRootMotion: 0
m_LinearVelocityBlending: 0
m_StabilizeFeet: 0
m_WarningMessage:
m_HasTransformHierarchy: 1
m_AllowConstantClipSamplingOptimization: 1
m_KeepAnimatorStateOnDisable: 0
@@ -11,6 +11,7 @@ GameObject:
- component: {fileID: 6696708220561039824}
- component: {fileID: 7728360785653902965}
- component: {fileID: 5522627527826561727}
- component: {fileID: 5865110850231368097}
m_Layer: 0
m_Name: PalmTree
m_TagString: Untagged
@@ -84,3 +85,23 @@ MeshRenderer:
m_SortingLayer: 0
m_SortingOrder: 0
m_AdditionalVertexStreams: {fileID: 0}
--- !u!95 &5865110850231368097
Animator:
serializedVersion: 5
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6315361735361100650}
m_Enabled: 1
m_Avatar: {fileID: 0}
m_Controller: {fileID: 9100000, guid: f664c60392a82504680ae1257b6e3645, type: 2}
m_CullingMode: 0
m_UpdateMode: 0
m_ApplyRootMotion: 0
m_LinearVelocityBlending: 0
m_StabilizeFeet: 0
m_WarningMessage:
m_HasTransformHierarchy: 1
m_AllowConstantClipSamplingOptimization: 1
m_KeepAnimatorStateOnDisable: 0
+50 -50
View File
@@ -13230,19 +13230,19 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 8376330369100222945, guid: e5d471764a8bab74991ce859cf7a9108, type: 3}
propertyPath: m_LocalRotation.w
value: 0.6733117
value: 0.68610275
objectReference: {fileID: 0}
- target: {fileID: 8376330369100222945, guid: e5d471764a8bab74991ce859cf7a9108, type: 3}
propertyPath: m_LocalRotation.x
value: -0.6733117
value: -0.68610275
objectReference: {fileID: 0}
- target: {fileID: 8376330369100222945, guid: e5d471764a8bab74991ce859cf7a9108, type: 3}
propertyPath: m_LocalRotation.y
value: -0.21598937
value: -0.17106454
objectReference: {fileID: 0}
- target: {fileID: 8376330369100222945, guid: e5d471764a8bab74991ce859cf7a9108, type: 3}
propertyPath: m_LocalRotation.z
value: -0.21598937
value: -0.17106454
objectReference: {fileID: 0}
- target: {fileID: 8376330369100222945, guid: e5d471764a8bab74991ce859cf7a9108, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
@@ -13254,7 +13254,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 8376330369100222945, guid: e5d471764a8bab74991ce859cf7a9108, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: -35.571
value: -28
objectReference: {fileID: 0}
- target: {fileID: 9184357772923849563, guid: e5d471764a8bab74991ce859cf7a9108, type: 3}
propertyPath: m_Name
@@ -13467,19 +13467,19 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 644488152736743051, guid: 0fd8341a290a9fc4bb33e95d73b1a24c, type: 3}
propertyPath: m_LocalRotation.w
value: 0.6881681
value: 0.68610275
objectReference: {fileID: 0}
- target: {fileID: 644488152736743051, guid: 0fd8341a290a9fc4bb33e95d73b1a24c, type: 3}
propertyPath: m_LocalRotation.x
value: -0.6881681
value: -0.68610275
objectReference: {fileID: 0}
- target: {fileID: 644488152736743051, guid: 0fd8341a290a9fc4bb33e95d73b1a24c, type: 3}
propertyPath: m_LocalRotation.y
value: -0.16255678
value: -0.17106454
objectReference: {fileID: 0}
- target: {fileID: 644488152736743051, guid: 0fd8341a290a9fc4bb33e95d73b1a24c, type: 3}
propertyPath: m_LocalRotation.z
value: -0.16255678
value: -0.17106454
objectReference: {fileID: 0}
- target: {fileID: 644488152736743051, guid: 0fd8341a290a9fc4bb33e95d73b1a24c, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
@@ -13491,7 +13491,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 644488152736743051, guid: 0fd8341a290a9fc4bb33e95d73b1a24c, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: -26.581
value: -28
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 0fd8341a290a9fc4bb33e95d73b1a24c, type: 3}
@@ -21872,19 +21872,19 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 8630449442833824813, guid: 80d097c3941e16842b887b6fed03f3b9, type: 3}
propertyPath: m_LocalRotation.w
value: 0.6876514
value: 0.68610275
objectReference: {fileID: 0}
- target: {fileID: 8630449442833824813, guid: 80d097c3941e16842b887b6fed03f3b9, type: 3}
propertyPath: m_LocalRotation.x
value: -0.6876514
value: -0.68610275
objectReference: {fileID: 0}
- target: {fileID: 8630449442833824813, guid: 80d097c3941e16842b887b6fed03f3b9, type: 3}
propertyPath: m_LocalRotation.y
value: -0.16472894
value: -0.17106454
objectReference: {fileID: 0}
- target: {fileID: 8630449442833824813, guid: 80d097c3941e16842b887b6fed03f3b9, type: 3}
propertyPath: m_LocalRotation.z
value: -0.16472894
value: -0.17106454
objectReference: {fileID: 0}
- target: {fileID: 8630449442833824813, guid: 80d097c3941e16842b887b6fed03f3b9, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
@@ -21896,7 +21896,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 8630449442833824813, guid: 80d097c3941e16842b887b6fed03f3b9, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: -26.943
value: -28
objectReference: {fileID: 0}
- target: {fileID: 8975204180790847127, guid: 80d097c3941e16842b887b6fed03f3b9, type: 3}
propertyPath: m_Name
@@ -22197,19 +22197,19 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 644488152736743051, guid: 0fd8341a290a9fc4bb33e95d73b1a24c, type: 3}
propertyPath: m_LocalRotation.w
value: 0.6867074
value: 0.68610275
objectReference: {fileID: 0}
- target: {fileID: 644488152736743051, guid: 0fd8341a290a9fc4bb33e95d73b1a24c, type: 3}
propertyPath: m_LocalRotation.x
value: -0.6867074
value: -0.68610275
objectReference: {fileID: 0}
- target: {fileID: 644488152736743051, guid: 0fd8341a290a9fc4bb33e95d73b1a24c, type: 3}
propertyPath: m_LocalRotation.y
value: -0.16862088
value: -0.17106454
objectReference: {fileID: 0}
- target: {fileID: 644488152736743051, guid: 0fd8341a290a9fc4bb33e95d73b1a24c, type: 3}
propertyPath: m_LocalRotation.z
value: -0.16862088
value: -0.17106454
objectReference: {fileID: 0}
- target: {fileID: 644488152736743051, guid: 0fd8341a290a9fc4bb33e95d73b1a24c, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
@@ -22221,7 +22221,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 644488152736743051, guid: 0fd8341a290a9fc4bb33e95d73b1a24c, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: -27.592
value: -28
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 0fd8341a290a9fc4bb33e95d73b1a24c, type: 3}
@@ -23184,19 +23184,19 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 8376330369100222945, guid: e5d471764a8bab74991ce859cf7a9108, type: 3}
propertyPath: m_LocalRotation.w
value: 0.6934033
value: 0.68610275
objectReference: {fileID: 0}
- target: {fileID: 8376330369100222945, guid: e5d471764a8bab74991ce859cf7a9108, type: 3}
propertyPath: m_LocalRotation.x
value: -0.6934033
value: -0.68610275
objectReference: {fileID: 0}
- target: {fileID: 8376330369100222945, guid: e5d471764a8bab74991ce859cf7a9108, type: 3}
propertyPath: m_LocalRotation.y
value: -0.13853483
value: -0.17106454
objectReference: {fileID: 0}
- target: {fileID: 8376330369100222945, guid: e5d471764a8bab74991ce859cf7a9108, type: 3}
propertyPath: m_LocalRotation.z
value: -0.13853481
value: -0.17106454
objectReference: {fileID: 0}
- target: {fileID: 8376330369100222945, guid: e5d471764a8bab74991ce859cf7a9108, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
@@ -23208,7 +23208,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 8376330369100222945, guid: e5d471764a8bab74991ce859cf7a9108, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: -22.597
value: -28
objectReference: {fileID: 0}
- target: {fileID: 9184357772923849563, guid: e5d471764a8bab74991ce859cf7a9108, type: 3}
propertyPath: m_Name
@@ -25916,19 +25916,19 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 8376330369100222945, guid: e5d471764a8bab74991ce859cf7a9108, type: 3}
propertyPath: m_LocalRotation.w
value: 0.6897269
value: 0.68610275
objectReference: {fileID: 0}
- target: {fileID: 8376330369100222945, guid: e5d471764a8bab74991ce859cf7a9108, type: 3}
propertyPath: m_LocalRotation.x
value: -0.6897269
value: -0.68610275
objectReference: {fileID: 0}
- target: {fileID: 8376330369100222945, guid: e5d471764a8bab74991ce859cf7a9108, type: 3}
propertyPath: m_LocalRotation.y
value: -0.15581036
value: -0.17106454
objectReference: {fileID: 0}
- target: {fileID: 8376330369100222945, guid: e5d471764a8bab74991ce859cf7a9108, type: 3}
propertyPath: m_LocalRotation.z
value: -0.15581036
value: -0.17106454
objectReference: {fileID: 0}
- target: {fileID: 8376330369100222945, guid: e5d471764a8bab74991ce859cf7a9108, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
@@ -25940,7 +25940,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 8376330369100222945, guid: e5d471764a8bab74991ce859cf7a9108, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: -25.459
value: -28
objectReference: {fileID: 0}
- target: {fileID: 9184357772923849563, guid: e5d471764a8bab74991ce859cf7a9108, type: 3}
propertyPath: m_Name
@@ -34010,19 +34010,19 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 8630449442833824813, guid: 80d097c3941e16842b887b6fed03f3b9, type: 3}
propertyPath: m_LocalRotation.w
value: 0.6909331
value: 0.68610275
objectReference: {fileID: 0}
- target: {fileID: 8630449442833824813, guid: 80d097c3941e16842b887b6fed03f3b9, type: 3}
propertyPath: m_LocalRotation.x
value: -0.6909331
value: -0.68610275
objectReference: {fileID: 0}
- target: {fileID: 8630449442833824813, guid: 80d097c3941e16842b887b6fed03f3b9, type: 3}
propertyPath: m_LocalRotation.y
value: -0.15037099
value: -0.17106454
objectReference: {fileID: 0}
- target: {fileID: 8630449442833824813, guid: 80d097c3941e16842b887b6fed03f3b9, type: 3}
propertyPath: m_LocalRotation.z
value: -0.150371
value: -0.17106454
objectReference: {fileID: 0}
- target: {fileID: 8630449442833824813, guid: 80d097c3941e16842b887b6fed03f3b9, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
@@ -34034,7 +34034,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 8630449442833824813, guid: 80d097c3941e16842b887b6fed03f3b9, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: -24.556
value: -28
objectReference: {fileID: 0}
- target: {fileID: 8975204180790847127, guid: 80d097c3941e16842b887b6fed03f3b9, type: 3}
propertyPath: m_Name
@@ -37481,19 +37481,19 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 8630449442833824813, guid: 80d097c3941e16842b887b6fed03f3b9, type: 3}
propertyPath: m_LocalRotation.w
value: 0.6666903
value: 0.68610275
objectReference: {fileID: 0}
- target: {fileID: 8630449442833824813, guid: 80d097c3941e16842b887b6fed03f3b9, type: 3}
propertyPath: m_LocalRotation.x
value: -0.6666903
value: -0.68610275
objectReference: {fileID: 0}
- target: {fileID: 8630449442833824813, guid: 80d097c3941e16842b887b6fed03f3b9, type: 3}
propertyPath: m_LocalRotation.y
value: -0.23563547
value: -0.17106454
objectReference: {fileID: 0}
- target: {fileID: 8630449442833824813, guid: 80d097c3941e16842b887b6fed03f3b9, type: 3}
propertyPath: m_LocalRotation.z
value: -0.23563547
value: -0.17106454
objectReference: {fileID: 0}
- target: {fileID: 8630449442833824813, guid: 80d097c3941e16842b887b6fed03f3b9, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
@@ -37505,7 +37505,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 8630449442833824813, guid: 80d097c3941e16842b887b6fed03f3b9, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: -38.931
value: -28
objectReference: {fileID: 0}
- target: {fileID: 8975204180790847127, guid: 80d097c3941e16842b887b6fed03f3b9, type: 3}
propertyPath: m_Name
@@ -43348,19 +43348,19 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 8376330369100222945, guid: e5d471764a8bab74991ce859cf7a9108, type: 3}
propertyPath: m_LocalRotation.w
value: 0.70410407
value: 0.68610275
objectReference: {fileID: 0}
- target: {fileID: 8376330369100222945, guid: e5d471764a8bab74991ce859cf7a9108, type: 3}
propertyPath: m_LocalRotation.x
value: -0.70410407
value: -0.68610275
objectReference: {fileID: 0}
- target: {fileID: 8376330369100222945, guid: e5d471764a8bab74991ce859cf7a9108, type: 3}
propertyPath: m_LocalRotation.y
value: -0.065096475
value: -0.17106454
objectReference: {fileID: 0}
- target: {fileID: 8376330369100222945, guid: e5d471764a8bab74991ce859cf7a9108, type: 3}
propertyPath: m_LocalRotation.z
value: -0.065096475
value: -0.17106454
objectReference: {fileID: 0}
- target: {fileID: 8376330369100222945, guid: e5d471764a8bab74991ce859cf7a9108, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
@@ -43372,7 +43372,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 8376330369100222945, guid: e5d471764a8bab74991ce859cf7a9108, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: -10.564
value: -28
objectReference: {fileID: 0}
- target: {fileID: 9184357772923849563, guid: e5d471764a8bab74991ce859cf7a9108, type: 3}
propertyPath: m_Name
@@ -43555,19 +43555,19 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 8630449442833824813, guid: 80d097c3941e16842b887b6fed03f3b9, type: 3}
propertyPath: m_LocalRotation.w
value: 0.68722904
value: 0.68610275
objectReference: {fileID: 0}
- target: {fileID: 8630449442833824813, guid: 80d097c3941e16842b887b6fed03f3b9, type: 3}
propertyPath: m_LocalRotation.x
value: -0.68722904
value: -0.68610275
objectReference: {fileID: 0}
- target: {fileID: 8630449442833824813, guid: 80d097c3941e16842b887b6fed03f3b9, type: 3}
propertyPath: m_LocalRotation.y
value: -0.16648199
value: -0.17106454
objectReference: {fileID: 0}
- target: {fileID: 8630449442833824813, guid: 80d097c3941e16842b887b6fed03f3b9, type: 3}
propertyPath: m_LocalRotation.z
value: -0.16648199
value: -0.17106454
objectReference: {fileID: 0}
- target: {fileID: 8630449442833824813, guid: 80d097c3941e16842b887b6fed03f3b9, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
@@ -43579,7 +43579,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 8630449442833824813, guid: 80d097c3941e16842b887b6fed03f3b9, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: -27.235
value: -28
objectReference: {fileID: 0}
- target: {fileID: 8975204180790847127, guid: 80d097c3941e16842b887b6fed03f3b9, type: 3}
propertyPath: m_Name
@@ -51,6 +51,8 @@ public class PlayablePlayer : Player
diceScript = dice.GetComponent<Dice>();
instance = this;
AddItem(client.items[2]);
}
public static PlayablePlayer GetCurrentInstance()
@@ -99,8 +99,7 @@ public class StartHandler : MonoBehaviour
stream.Read(readMessage, 0, 10);
string s = Encoding.ASCII.GetString(readMessage);
Debug.Log(s);
PlayerPrefs.SetString("roomcode", s);
PlayerPrefs.Save();
SceneManager.LoadScene(1, LoadSceneMode.Single);
@@ -137,9 +137,7 @@ PlayerSettings:
16:9: 1
Others: 1
bundleVersion: 0.16
preloadedAssets:
- {fileID: -6230802382160794249, guid: 90cd1b71078984c4980fcd1aa03eaaa3, type: 2}
- {fileID: 11400000, guid: 48bf7376b3770c44cbfe3f40e77359ab, type: 2}
preloadedAssets: []
metroInputSource: 0
wsaTransparentSwapchain: 0
m_HolographicPauseOnTrackingLoss: 1