GJP/GlobalGameJame
3
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

add catana, shurikens and repair weapon changin and meele weapon animation

Browse Source
This commit is contained in:
haitem
2021-09-21 23:09:33 +02:00
parent 2ecd9d20ac
commit 6741aa8b4d
53 changed files with 15052 additions and 1703 deletions
Download Patch File Download Diff File Expand all files Collapse all files

117
Assets/Scenes/PlayScene.unity
View File

@@ -6944,11 +6944,11 @@ RectTransform:
m_Father: {fileID: 587476773}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 1}
m_AnchorMax: {x: 0.5, y: 1}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 128, y: 32}
m_Pivot: {x: 0.5, y: 1}
m_Pivot: {x: 0, y: 0}
--- !u!114 &1191888898
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -7143,11 +7143,11 @@ RectTransform:
m_Father: {fileID: 587476773}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchorMin: {x: 1, y: 0}
m_AnchorMax: {x: 1, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 400, y: 400}
m_Pivot: {x: 0, y: 0}
m_Pivot: {x: 1, y: 0}
--- !u!114 &1327297298
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -7231,17 +7231,17 @@ RectTransform:
m_GameObject: {fileID: 1368020645}
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_LocalScale: {x: 2, y: 2, z: 2}
m_Children:
- {fileID: 1942255811}
m_Father: {fileID: 587476773}
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 1}
m_AnchorMax: {x: 0.5, y: 1}
m_AnchoredPosition: {x: 0, y: -70}
m_SizeDelta: {x: 160, y: 30}
m_Pivot: {x: 0.5, y: 1}
m_AnchorMin: {x: 1, y: 1}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: -10, y: -10}
m_SizeDelta: {x: 49, y: 39}
m_Pivot: {x: 1, y: 1}
--- !u!114 &1368020647
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -7262,7 +7262,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: aca2defce6c6d644bb6e1a60a2ddae23, type: 3}
m_Sprite: {fileID: 21300000, guid: bf3c045077238324cb2b2efcb2ffa74e, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@@ -7839,7 +7839,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 37
m_RootOrder: 36
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1814508279 stripped
GameObject:
@@ -8015,54 +8015,6 @@ Transform:
type: 3}
m_PrefabInstance: {fileID: 250080840}
m_PrefabAsset: {fileID: 0}
--- !u!1 &1908201563
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1908201565}
- component: {fileID: 1908201564}
m_Layer: 20
m_Name: PPV
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!114 &1908201564
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1908201563}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 8b9a305e18de0c04dbd257a21cd47087, type: 3}
m_Name:
m_EditorClassIdentifier:
sharedProfile: {fileID: 11400000, guid: 601f6c5576713424aabe25899d8694a8, type: 2}
isGlobal: 1
blendDistance: 0
weight: 1
priority: 0
--- !u!4 &1908201565
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1908201563}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 6.3091087, y: 5.945063, z: -8.237778}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 36
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &1922663893
PrefabInstance:
m_ObjectHideFlags: 0
@@ -8356,11 +8308,11 @@ MonoBehaviour:
m_Calls: []
m_FontData:
m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
m_FontSize: 20
m_FontSize: 100
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 2
m_MaxSize: 40
m_MinSize: 1
m_MaxSize: 100
m_Alignment: 1
m_AlignByGeometry: 0
m_RichText: 1
@@ -8385,16 +8337,16 @@ RectTransform:
m_GameObject: {fileID: 1942255808}
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_LocalScale: {x: 0.1, y: 0.1, z: 0.1}
m_Children: []
m_Father: {fileID: 1368020646}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 1}
m_AnchorMax: {x: 0.5, y: 1}
m_AnchoredPosition: {x: 0, y: -3.8}
m_SizeDelta: {x: 130, y: 24}
m_Pivot: {x: 0.5, y: 1}
m_AnchorMin: {x: 0.5, y: 0}
m_AnchorMax: {x: 0.5, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 260, y: 120}
m_Pivot: {x: 0.5, y: 0}
--- !u!1 &2079126252 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 835007492758508419, guid: 5322794fa1699704b8e50a14cef106b1,
@@ -8803,7 +8755,7 @@ PrefabInstance:
- target: {fileID: 3435627263884782622, guid: 51b65bc1216f2c4469761bc1039bfce1,
type: 3}
propertyPath: m_RootOrder
value: 40
value: 37
objectReference: {fileID: 0}
- target: {fileID: 3435627263884782622, guid: 51b65bc1216f2c4469761bc1039bfce1,
type: 3}
@@ -9426,7 +9378,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 532783939, guid: 204c7411afdd01a478b1a1e25607d50c, type: 3}
propertyPath: m_Volume
value: 1
value: 0.2
objectReference: {fileID: 0}
- target: {fileID: 532783939, guid: 204c7411afdd01a478b1a1e25607d50c, type: 3}
propertyPath: MinDistance
@@ -9444,7 +9396,7 @@ PrefabInstance:
- target: {fileID: 5981860502065413816, guid: 204c7411afdd01a478b1a1e25607d50c,
type: 3}
propertyPath: m_Volume
value: 0.08
value: 0.01
objectReference: {fileID: 0}
- target: {fileID: 6900128296167351179, guid: 204c7411afdd01a478b1a1e25607d50c,
type: 3}
@@ -9466,6 +9418,23 @@ PrefabInstance:
propertyPath: guiManager
value:
objectReference: {fileID: 587476774}
- target: {fileID: 7985979212931499548, guid: 204c7411afdd01a478b1a1e25607d50c,
type: 3}
propertyPath: weaponList.Array.size
value: 5
objectReference: {fileID: 0}
- target: {fileID: 7985979212931499548, guid: 204c7411afdd01a478b1a1e25607d50c,
type: 3}
propertyPath: weaponList.Array.data[3]
value:
objectReference: {fileID: 4058209543356239592, guid: eed2a44203ade1147baeece20744f05a,
type: 3}
- target: {fileID: 7985979212931499548, guid: 204c7411afdd01a478b1a1e25607d50c,
type: 3}
propertyPath: weaponList.Array.data[4]
value:
objectReference: {fileID: 2243460039765714572, guid: 2845b9b575871e24caafd706075833f2,
type: 3}
- target: {fileID: 7985979212931499549, guid: 204c7411afdd01a478b1a1e25607d50c,
type: 3}
propertyPath: m_RootOrder