mePixel/pokeFight
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

commit

Browse Source 
commit
This commit is contained in:
Xaver 2024-11-26 10:29:14 +01:00
parent 80c5422aa1
commit 3f46a8bb9e
21 changed files with 1625 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
pokeFight/.plastic/plastic.changes Normal file
View File

Binary file not shown.

BIN
pokeFight/.plastic/plastic.wktree
View File

Binary file not shown.

BIN
pokeFight/Assets/Models/Demon.fbx (Stored with Git LFS) Normal file
View File

Binary file not shown.

109
pokeFight/Assets/Models/Demon.fbx.meta Normal file
View File

@ -0,0 +1,109 @@
fileFormatVersion: 2
guid: 95f9a6c7db7ec4fd6a1340e302fe1fcc
ModelImporter:
serializedVersion: 22200
internalIDToNameTable: []
externalObjects: {}
materials:
materialImportMode: 2
materialName: 0
materialSearch: 1
materialLocation: 1
animations:
legacyGenerateAnimations: 4
bakeSimulation: 0
resampleCurves: 1
optimizeGameObjects: 0
removeConstantScaleCurves: 0
motionNodeName:
rigImportErrors:
rigImportWarnings:
animationImportErrors:
animationImportWarnings:
animationRetargetingWarnings:
animationDoRetargetingWarnings: 0
importAnimatedCustomProperties: 0
importConstraints: 0
animationCompression: 1
animationRotationError: 0.5
animationPositionError: 0.5
animationScaleError: 0.5
animationWrapMode: 0
extraExposedTransformPaths: []
extraUserProperties: []
clipAnimations: []
isReadable: 0
meshes:
lODScreenPercentages: []
globalScale: 1
meshCompression: 0
addColliders: 0
useSRGBMaterialColor: 1
sortHierarchyByName: 1
importPhysicalCameras: 1
importVisibility: 1
importBlendShapes: 1
importCameras: 1
importLights: 1
nodeNameCollisionStrategy: 1
fileIdsGeneration: 2
swapUVChannels: 0
generateSecondaryUV: 0
useFileUnits: 1
keepQuads: 0
weldVertices: 1
bakeAxisConversion: 0
preserveHierarchy: 0
skinWeightsMode: 0
maxBonesPerVertex: 4
minBoneWeight: 0.001
optimizeBones: 1
meshOptimizationFlags: -1
indexFormat: 0
secondaryUVAngleDistortion: 8
secondaryUVAreaDistortion: 15.000001
secondaryUVHardAngle: 88
secondaryUVMarginMethod: 1
secondaryUVMinLightmapResolution: 40
secondaryUVMinObjectScale: 1
secondaryUVPackMargin: 4
useFileScale: 1
strictVertexDataChecks: 0
tangentSpace:
normalSmoothAngle: 60
normalImportMode: 0
tangentImportMode: 3
normalCalculationMode: 4
legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0
blendShapeNormalImportMode: 1
normalSmoothingSource: 0
referencedClips: []
importAnimation: 1
humanDescription:
serializedVersion: 3
human: []
skeleton: []
armTwist: 0.5
foreArmTwist: 0.5
upperLegTwist: 0.5
legTwist: 0.5
armStretch: 0.05
legStretch: 0.05
feetSpacing: 0
globalScale: 1
rootMotionBoneName:
hasTranslationDoF: 0
hasExtraRoot: 0
skeletonHasParents: 1
lastHumanDescriptionAvatarSource: {instanceID: 0}
autoGenerateAvatarMappingIfUnspecified: 1
animationType: 2
humanoidOversampling: 1
avatarSetup: 0
addHumanoidExtraRootOnlyWhenUsingAvatar: 1
importBlendShapeDeformPercent: 1
remapMaterialsIfMaterialImportModeIsNone: 0
additionalBone: 0
userData:
assetBundleName:
assetBundleVariant:

BIN
pokeFight/Assets/Models/Yeti.fbx (Stored with Git LFS) Normal file
View File

Binary file not shown.

109
pokeFight/Assets/Models/Yeti.fbx.meta Normal file
View File

@ -0,0 +1,109 @@
fileFormatVersion: 2
guid: 03442d1c0e6b14fa6989764d9e8c1037
ModelImporter:
serializedVersion: 22200
internalIDToNameTable: []
externalObjects: {}
materials:
materialImportMode: 2
materialName: 0
materialSearch: 1
materialLocation: 1
animations:
legacyGenerateAnimations: 4
bakeSimulation: 0
resampleCurves: 1
optimizeGameObjects: 0
removeConstantScaleCurves: 0
motionNodeName:
rigImportErrors:
rigImportWarnings:
animationImportErrors:
animationImportWarnings:
animationRetargetingWarnings:
animationDoRetargetingWarnings: 0
importAnimatedCustomProperties: 0
importConstraints: 0
animationCompression: 1
animationRotationError: 0.5
animationPositionError: 0.5
animationScaleError: 0.5
animationWrapMode: 0
extraExposedTransformPaths: []
extraUserProperties: []
clipAnimations: []
isReadable: 0
meshes:
lODScreenPercentages: []
globalScale: 1
meshCompression: 0
addColliders: 0
useSRGBMaterialColor: 1
sortHierarchyByName: 1
importPhysicalCameras: 1
importVisibility: 1
importBlendShapes: 1
importCameras: 1
importLights: 1
nodeNameCollisionStrategy: 1
fileIdsGeneration: 2
swapUVChannels: 0
generateSecondaryUV: 0
useFileUnits: 1
keepQuads: 0
weldVertices: 1
bakeAxisConversion: 0
preserveHierarchy: 0
skinWeightsMode: 0
maxBonesPerVertex: 4
minBoneWeight: 0.001
optimizeBones: 1
meshOptimizationFlags: -1
indexFormat: 0
secondaryUVAngleDistortion: 8
secondaryUVAreaDistortion: 15.000001
secondaryUVHardAngle: 88
secondaryUVMarginMethod: 1
secondaryUVMinLightmapResolution: 40
secondaryUVMinObjectScale: 1
secondaryUVPackMargin: 4
useFileScale: 1
strictVertexDataChecks: 0
tangentSpace:
normalSmoothAngle: 60
normalImportMode: 0
tangentImportMode: 3
normalCalculationMode: 4
legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0
blendShapeNormalImportMode: 1
normalSmoothingSource: 0
referencedClips: []
importAnimation: 1
humanDescription:
serializedVersion: 3
human: []
skeleton: []
armTwist: 0.5
foreArmTwist: 0.5
upperLegTwist: 0.5
legTwist: 0.5
armStretch: 0.05
legStretch: 0.05
feetSpacing: 0
globalScale: 1
rootMotionBoneName:
hasTranslationDoF: 0
hasExtraRoot: 0
skeletonHasParents: 1
lastHumanDescriptionAvatarSource: {instanceID: 0}
autoGenerateAvatarMappingIfUnspecified: 1
animationType: 2
humanoidOversampling: 1
avatarSetup: 0
addHumanoidExtraRootOnlyWhenUsingAvatar: 1
importBlendShapeDeformPercent: 1
remapMaterialsIfMaterialImportModeIsNone: 0
additionalBone: 0
userData:
assetBundleName:
assetBundleVariant:

BIN
pokeFight/Assets/Models/Zombie.fbx (Stored with Git LFS) Normal file
View File

Binary file not shown.

109
pokeFight/Assets/Models/Zombie.fbx.meta Normal file
View File

@ -0,0 +1,109 @@
fileFormatVersion: 2
guid: ee6f2603291164112b95e667908d9aa9
ModelImporter:
serializedVersion: 22200
internalIDToNameTable: []
externalObjects: {}
materials:
materialImportMode: 2
materialName: 0
materialSearch: 1
materialLocation: 1
animations:
legacyGenerateAnimations: 4
bakeSimulation: 0
resampleCurves: 1
optimizeGameObjects: 0
removeConstantScaleCurves: 0
motionNodeName:
rigImportErrors:
rigImportWarnings:
animationImportErrors:
animationImportWarnings:
animationRetargetingWarnings:
animationDoRetargetingWarnings: 0
importAnimatedCustomProperties: 0
importConstraints: 0
animationCompression: 1
animationRotationError: 0.5
animationPositionError: 0.5
animationScaleError: 0.5
animationWrapMode: 0
extraExposedTransformPaths: []
extraUserProperties: []
clipAnimations: []
isReadable: 0
meshes:
lODScreenPercentages: []
globalScale: 1
meshCompression: 0
addColliders: 0
useSRGBMaterialColor: 1
sortHierarchyByName: 1
importPhysicalCameras: 1
importVisibility: 1
importBlendShapes: 1
importCameras: 1
importLights: 1
nodeNameCollisionStrategy: 1
fileIdsGeneration: 2
swapUVChannels: 0
generateSecondaryUV: 0
useFileUnits: 1
keepQuads: 0
weldVertices: 1
bakeAxisConversion: 0
preserveHierarchy: 0
skinWeightsMode: 0
maxBonesPerVertex: 4
minBoneWeight: 0.001
optimizeBones: 1
meshOptimizationFlags: -1
indexFormat: 0
secondaryUVAngleDistortion: 8
secondaryUVAreaDistortion: 15.000001
secondaryUVHardAngle: 88
secondaryUVMarginMethod: 1
secondaryUVMinLightmapResolution: 40
secondaryUVMinObjectScale: 1
secondaryUVPackMargin: 4
useFileScale: 1
strictVertexDataChecks: 0
tangentSpace:
normalSmoothAngle: 60
normalImportMode: 0
tangentImportMode: 3
normalCalculationMode: 4
legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0
blendShapeNormalImportMode: 1
normalSmoothingSource: 0
referencedClips: []
importAnimation: 1
humanDescription:
serializedVersion: 3
human: []
skeleton: []
armTwist: 0.5
foreArmTwist: 0.5
upperLegTwist: 0.5
legTwist: 0.5
armStretch: 0.05
legStretch: 0.05
feetSpacing: 0
globalScale: 1
rootMotionBoneName:
hasTranslationDoF: 0
hasExtraRoot: 0
skeletonHasParents: 1
lastHumanDescriptionAvatarSource: {instanceID: 0}
autoGenerateAvatarMappingIfUnspecified: 1
animationType: 2
humanoidOversampling: 1
avatarSetup: 0
addHumanoidExtraRootOnlyWhenUsingAvatar: 1
importBlendShapeDeformPercent: 1
remapMaterialsIfMaterialImportModeIsNone: 0
additionalBone: 0
userData:
assetBundleName:
assetBundleVariant:

2
pokeFight/Assets/Scenes/SampleScene.unity
View File

@ -38,7 +38,7 @@ RenderSettings:
m_ReflectionIntensity: 1
m_CustomReflection: {fileID: 0}
m_Sun: {fileID: 0}
m_IndirectSpecularColor: {r: 0.18028378, g: 0.22571412, b: 0.30692285, a: 1}
m_IndirectSpecularColor: {r: 0.18028373, g: 0.22571398, b: 0.30692294, a: 1}
m_UseRadianceAmbientProbe: 0
--- !u!157 &3
LightmapSettings:

BIN
pokeFight/Temp/FSTimeGet-bf31a2c4d98424a4382cbe53b5fdb661 Normal file
View File

Binary file not shown.

BIN
pokeFight/Temp/FSTimeGet-dfca9908811474ca8a943ff7d03faea4 Normal file
View File

Binary file not shown.

BIN
pokeFight/Temp/FSTimeGet-f216618ac50ee41108941fea5969c0aa Normal file
View File

Binary file not shown.

1231
pokeFight/Temp/TutorialLayout.wlt Normal file
View File

File diff suppressed because it is too large Load Diff

0
pokeFight/Temp/UnityLockfile Normal file
View File

BIN
pokeFight/Temp/workerlic Normal file
View File

Binary file not shown.

114
pokeFight/UserSettings/Layouts/default-2022.dwlt
View File

@ -15,8 +15,8 @@ MonoBehaviour:
m_PixelRect:
serializedVersion: 2
x: 0
y: 43
width: 2560
y: 72
width: 1800
height: 989
m_ShowMode: 4
m_Title: Unity Version Control
@ -42,12 +42,12 @@ MonoBehaviour:
serializedVersion: 2
x: 0
y: 30
width: 2560
width: 1800
height: 939
m_MinSize: {x: 300, y: 100}
m_MaxSize: {x: 24288, y: 16192}
vertical: 1
controlID: 42
controlID: 102
--- !u!114 &3
MonoBehaviour:
m_ObjectHideFlags: 52
@ -68,7 +68,7 @@ MonoBehaviour:
serializedVersion: 2
x: 0
y: 0
width: 2560
width: 1800
height: 989
m_MinSize: {x: 875, y: 300}
m_MaxSize: {x: 10000, y: 10000}
@ -93,7 +93,7 @@ MonoBehaviour:
serializedVersion: 2
x: 0
y: 0
width: 2560
width: 1800
height: 30
m_MinSize: {x: 0, y: 0}
m_MaxSize: {x: 0, y: 0}
@ -115,7 +115,7 @@ MonoBehaviour:
serializedVersion: 2
x: 0
y: 969
width: 2560
width: 1800
height: 20
m_MinSize: {x: 0, y: 0}
m_MaxSize: {x: 0, y: 0}
@ -138,12 +138,12 @@ MonoBehaviour:
serializedVersion: 2
x: 0
y: 0
width: 2560
width: 1800
height: 939
m_MinSize: {x: 300, y: 100}
m_MaxSize: {x: 24288, y: 16192}
vertical: 0
controlID: 43
controlID: 103
--- !u!114 &7
MonoBehaviour:
m_ObjectHideFlags: 52
@ -163,12 +163,12 @@ MonoBehaviour:
serializedVersion: 2
x: 0
y: 0
width: 2015
width: 1417
height: 939
m_MinSize: {x: 200, y: 100}
m_MaxSize: {x: 16192, y: 16192}
vertical: 1
controlID: 44
controlID: 60
--- !u!114 &8
MonoBehaviour:
m_ObjectHideFlags: 52
@ -188,12 +188,12 @@ MonoBehaviour:
serializedVersion: 2
x: 0
y: 0
width: 2015
width: 1417
height: 688
m_MinSize: {x: 200, y: 50}
m_MaxSize: {x: 16192, y: 8096}
vertical: 0
controlID: 45
controlID: 27
--- !u!114 &9
MonoBehaviour:
m_ObjectHideFlags: 52
@ -211,7 +211,7 @@ MonoBehaviour:
serializedVersion: 2
x: 0
y: 0
width: 481
width: 338
height: 688
m_MinSize: {x: 201, y: 221}
m_MaxSize: {x: 4001, y: 4021}
@ -235,9 +235,9 @@ MonoBehaviour:
m_Children: []
m_Position:
serializedVersion: 2
x: 481
x: 338
y: 0
width: 1534
width: 1079
height: 688
m_MinSize: {x: 202, y: 221}
m_MaxSize: {x: 4002, y: 4021}
@ -265,7 +265,7 @@ MonoBehaviour:
serializedVersion: 2
x: 0
y: 688
width: 2015
width: 1417
height: 251
m_MinSize: {x: 231, y: 271}
m_MaxSize: {x: 10001, y: 10021}
@ -289,9 +289,9 @@ MonoBehaviour:
m_Children: []
m_Position:
serializedVersion: 2
x: 2015
x: 1417
y: 0
width: 545
width: 383
height: 939
m_MinSize: {x: 601, y: 371}
m_MaxSize: {x: 4001, y: 4021}
@ -323,9 +323,9 @@ MonoBehaviour:
m_Tooltip:
m_Pos:
serializedVersion: 2
x: 2015
y: 73
width: 544
x: 1417
y: 102
width: 382
height: 918
m_SerializedDataModeController:
m_DataMode: 0
@ -354,7 +354,7 @@ MonoBehaviour:
m_MaxSize: {x: 4000, y: 4000}
m_TitleContent:
m_Text: Animator
m_Image: {fileID: -1673928668082335149, guid: 0000000000000000d000000000000000,
m_Image: {fileID: 1711060831702674872, guid: 0000000000000000d000000000000000,
type: 0}
m_Tooltip:
m_Pos:
@ -430,7 +430,7 @@ MonoBehaviour:
m_MaxSize: {x: 4000, y: 4000}
m_TitleContent:
m_Text: Lighting
m_Image: {fileID: -1347227620855488341, guid: 0000000000000000d000000000000000,
m_Image: {fileID: -1477008817101679558, guid: 0000000000000000d000000000000000,
type: 0}
m_Tooltip:
m_Pos:
@ -465,7 +465,7 @@ MonoBehaviour:
m_MaxSize: {x: 4000, y: 4000}
m_TitleContent:
m_Text: Console
m_Image: {fileID: -4327648978806127646, guid: 0000000000000000d000000000000000,
m_Image: {fileID: -4950941429401207979, guid: 0000000000000000d000000000000000,
type: 0}
m_Tooltip:
m_Pos:
@ -500,14 +500,14 @@ MonoBehaviour:
m_MaxSize: {x: 4000, y: 4000}
m_TitleContent:
m_Text: Hierarchy
m_Image: {fileID: 7966133145522015247, guid: 0000000000000000d000000000000000,
m_Image: {fileID: -3734745235275155857, guid: 0000000000000000d000000000000000,
type: 0}
m_Tooltip:
m_Pos:
serializedVersion: 2
x: 0
y: 19
width: 480
y: 102
width: 337
height: 667
m_SerializedDataModeController:
m_DataMode: 0
@ -524,7 +524,7 @@ MonoBehaviour:
scrollPos: {x: 0, y: 0}
m_SelectedIDs:
m_LastClickedID: 0
m_ExpandedIDs: 24fbffff
m_ExpandedIDs: bef8fdff
m_RenameOverlay:
m_UserAcceptedRename: 0
m_Name:
@ -564,14 +564,14 @@ MonoBehaviour:
m_MaxSize: {x: 4000, y: 4000}
m_TitleContent:
m_Text: Scene
m_Image: {fileID: 2593428753322112591, guid: 0000000000000000d000000000000000,
m_Image: {fileID: 8634526014445323508, guid: 0000000000000000d000000000000000,
type: 0}
m_Tooltip:
m_Pos:
serializedVersion: 2
x: 481
y: 73
width: 1532
x: 338
y: 102
width: 1077
height: 667
m_SerializedDataModeController:
m_DataMode: 0
@ -981,7 +981,7 @@ MonoBehaviour:
m_Rotation:
m_Target: {x: -0.2909014, y: 0.31818613, z: -0.10326212, w: -0.8963685}
speed: 2
m_Value: {x: -0.2909006, y: 0.31818527, z: -0.103261836, w: -0.89636606}
m_Value: {x: -0.2909014, y: 0.31818613, z: -0.10326213, w: -0.8963685}
m_Size:
m_Target: 0.08107821
speed: 2
@ -1026,7 +1026,7 @@ MonoBehaviour:
m_MaxSize: {x: 4000, y: 4000}
m_TitleContent:
m_Text: Game
m_Image: {fileID: -6423792434712278376, guid: 0000000000000000d000000000000000,
m_Image: {fileID: 4621777727084837110, guid: 0000000000000000d000000000000000,
type: 0}
m_Tooltip:
m_Pos:
@ -1066,10 +1066,10 @@ MonoBehaviour:
m_VRangeLocked: 0
hZoomLockedByDefault: 0
vZoomLockedByDefault: 0
m_HBaseRangeMin: -766
m_HBaseRangeMax: 766
m_VBaseRangeMin: -323
m_VBaseRangeMax: 323
m_HBaseRangeMin: -383
m_HBaseRangeMax: 383
m_VBaseRangeMin: -161.5
m_VBaseRangeMax: 161.5
m_HAllowExceedBaseRangeMin: 1
m_HAllowExceedBaseRangeMax: 1
m_VAllowExceedBaseRangeMin: 1
@ -1089,7 +1089,7 @@ MonoBehaviour:
y: 21
width: 1532
height: 646
m_Scale: {x: 1, y: 1}
m_Scale: {x: 2, y: 2}
m_Translation: {x: 766, y: 323}
m_MarginLeft: 0
m_MarginRight: 0
@ -1097,13 +1097,13 @@ MonoBehaviour:
m_MarginBottom: 0
m_LastShownAreaInsideMargins:
serializedVersion: 2
x: -766
y: -323
width: 1532
height: 646
x: -383
y: -161.5
width: 766
height: 323
m_MinimalGUI: 1
m_defaultScale: 1
m_LastWindowPixelSize: {x: 1532, y: 667}
m_defaultScale: 2
m_LastWindowPixelSize: {x: 3064, y: 1334}
m_ClearInEditMode: 1
m_NoCameraWarning: 1
m_LowResolutionForAspectRatios: 01000001000000000000
@ -1125,14 +1125,14 @@ MonoBehaviour:
m_MaxSize: {x: 10000, y: 10000}
m_TitleContent:
m_Text: Project
m_Image: {fileID: -5467254957812901981, guid: 0000000000000000d000000000000000,
m_Image: {fileID: -5179483145760003458, guid: 0000000000000000d000000000000000,
type: 0}
m_Tooltip:
m_Pos:
serializedVersion: 2
x: 0
y: 761
width: 2014
y: 790
width: 1416
height: 230
m_SerializedDataModeController:
m_DataMode: 0
@ -1155,7 +1155,7 @@ MonoBehaviour:
m_SkipHidden: 0
m_SearchArea: 1
m_Folders:
- Assets/Models
- Assets
m_Globs: []
m_OriginalText:
m_ImportLogFlags: 0
@ -1163,16 +1163,16 @@ MonoBehaviour:
m_ViewMode: 1
m_StartGridSize: 64
m_LastFolders:
- Assets/Models
- Assets
m_LastFoldersGridSize: -1
m_LastProjectPath: H:\UnityProjects\pokeFIght
m_LastProjectPath: /Users/xaver/RiderProjects/pokeFight/pokeFight
m_LockTracker:
m_IsLocked: 0
m_FolderTreeState:
scrollPos: {x: 0, y: 14}
m_SelectedIDs: aa7e0000
m_LastClickedID: 32426
m_ExpandedIDs: 00000000a87e000000ca9a3b
m_SelectedIDs: f6400000
m_LastClickedID: 16630
m_ExpandedIDs: 00000000f640000000ca9a3b
m_RenameOverlay:
m_UserAcceptedRename: 0
m_Name:
@ -1200,7 +1200,7 @@ MonoBehaviour:
scrollPos: {x: 0, y: 0}
m_SelectedIDs:
m_LastClickedID: 0
m_ExpandedIDs: 00000000
m_ExpandedIDs:
m_RenameOverlay:
m_UserAcceptedRename: 0
m_Name:
@ -1272,7 +1272,7 @@ MonoBehaviour:
m_MaxSize: {x: 4000, y: 4000}
m_TitleContent:
m_Text: Inspector
m_Image: {fileID: -2667387946076563598, guid: 0000000000000000d000000000000000,
m_Image: {fileID: -440750813802333266, guid: 0000000000000000d000000000000000,
type: 0}
m_Tooltip:
m_Pos:

BIN
pokeFight/obj/Debug/PPv2URPConverters.csproj.AssemblyReference.cache Normal file
View File

Binary file not shown.

BIN
pokeFight/obj/Debug/Unity.Burst.csproj.AssemblyReference.cache
View File

Binary file not shown.

BIN
pokeFight/obj/Debug/Unity.Rider.Editor.csproj.AssemblyReference.cache
View File

Binary file not shown.

BIN
pokeFight/obj/Debug/Unity.Searcher.EditorTests.csproj.AssemblyReference.cache
View File

Binary file not shown.

BIN
pokeFight/obj/Debug/Unity.Timeline.Player.csproj.AssemblyReference.cache Normal file
View File

Binary file not shown.