39 Commits

Author SHA1 Message Date
3c788f410b ProjectVersion.txt 2022-05-15 18:47:06 +07:00
3ed89a8c10 Merge remote-tracking branch 'origin/krazerleo/core/1' into krazerleo/core/1
# Conflicts:
#	Assets/Resources/BillingMode.json.meta
#	Assets/Scenes/AnimationTestScene.unity.meta
#	ProjectSettings/ProjectVersion.txt
2022-05-09 21:34:46 +07:00
d617ddabe7 Added Animations. Changed inspector view for navpoints. A lot of fixes. Changed project structure. 2022-05-09 21:31:33 +07:00
183de6485f Merge branch 'krazerleo/core/1' of https://gitea.gavt45.ru/gav/real-shooter into krazerleo/core/1
# Conflicts:
#	ProjectSettings/ProjectVersion.txt
2022-05-07 23:22:19 +07:00
12d27d36ce _ 2022-05-07 23:17:08 +07:00
6aa872c92f Runtime bot behavior instantiation 2022-05-07 23:08:32 +07:00
4250777a36 Merge branch 'main' into krazerleo/core/1 2022-05-07 23:01:34 +07:00
aa7b50554b Added project version 2022-05-07 23:00:24 +07:00
fa6b5f602e Added test NB 2022-05-07 22:58:25 +07:00
8cce356b8e MVP work with ml-agents python library 2022-05-07 22:56:07 +07:00
8083501783 Merge branch 'krazerleo/core/1' of https://gitea.gavt45.ru/gav/real-shooter into krazerleo/core/1 2022-05-07 22:02:42 +07:00
f9a3b06ec3 files add 2022-05-07 22:02:15 +07:00
e7d2315040 Merge branch 'krazerleo/core/1' of https://gitea.gavt45.ru/gav/real-shooter into krazerleo/core/1 2022-05-07 22:00:46 +07:00
87568c4077 added scene 2022-05-07 22:00:19 +07:00
4962a4b5da Merge branch 'krazerleo/core/1' of https://gitea.gavt45.ru/gav/real-shooter into krazerleo/core/1 2022-05-07 21:53:09 +07:00
3908334f65 Finally fixed 2022-05-07 21:45:28 +07:00
b8e8e74ab4 Fixes in Map Manager 2022-05-05 20:45:26 +07:00
2caf658d19 "update unresolved conflicts" 2022-05-05 18:11:57 +07:00
ba1b350c62 resolved merge conflicts 2022-05-05 16:49:21 +07:00
6514599f22 Merge branch 'krazerleo/core/1' of https://gitea.gavt45.ru/gav/real-shooter into krazerleo/core/1 2022-05-05 16:30:27 +07:00
f3fe5ea4cd commit 665 2022-05-05 16:26:23 +07:00
cfb7b71a8a Fixed merge errors 2022-05-05 15:37:51 +07:00
1cf5776a1b Merge branch 'krazerleo/core/1' of https://gitea.gavt45.ru/gav/real-shooter into krazerleo/core/1 2022-05-05 11:48:32 +07:00
351fa8ee12 test 1 2022-05-05 01:10:04 +07:00
690f1e2536 test 2022-05-05 01:08:58 +07:00
e689927b73 dadwa 2022-05-05 00:55:51 +07:00
3420d14cdc merge 2022-05-04 23:57:38 +07:00
c8af0e5284 to new git 2022-05-04 23:50:07 +07:00
290f5515b7 update scripts 2022-04-25 16:23:25 +07:00
1e4f90c0ed Removed useless temporary files 2022-04-19 19:31:15 +07:00
28863de9df Merge branch 'krazerleo/core/1' 2022-04-19 19:29:10 +07:00
39d29da2be Merge branch 'main' into krazerleo/core/1 2022-04-19 19:28:44 +07:00
dfdd018a5f added mlagent jsons to gitignore 2022-04-19 19:25:45 +07:00
aae98595d3 Small fizes 2022-04-19 19:24:53 +07:00
4bd1e0644a latest 2022-04-18 19:01:06 +07:00
e1d0bbc1eb kirill loh 2022-04-18 10:53:21 +07:00
d911dce62a Merge pull request #5 from gavt45/karavan/nav/1
Merging model and player#1
2022-04-17 13:57:19 +07:00
79f27125b6 Merge branch 'main' into karavan/nav/1 2022-04-17 13:57:12 +07:00
e8d75b627c Merging model and player#1 2022-04-12 17:04:03 +07:00
213 changed files with 37808 additions and 3445 deletions

5
.gitignore vendored
View File

@ -2,6 +2,11 @@
#
# Get latest from https://github.com/github/gitignore/blob/main/Unity.gitignore
#
# MLagents
Assets/ML-Agents/Timers/*
#
/[Ll]ibrary/
/[Tt]emp/
/[Oo]bj/

1
1 Normal file
View File

@ -0,0 +1 @@

2
Assets/Defaults.meta → Assets/Arts.meta generated Executable file → Normal file
View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: b183268306ddaac4b875d5d435faa50b
guid: 0d3fef053a0198e44a77e5bbb1c9e6ba
folderAsset: yes
DefaultImporter:
externalObjects: {}

0
Assets/Materials.meta → Assets/Arts/Materials.meta generated Executable file → Normal file
View File

View File

0
Assets/Models.meta → Assets/Arts/Models.meta generated Executable file → Normal file
View File

View File

View File

0
Assets/Models/Textures.meta → Assets/Arts/Models/Textures.meta generated Executable file → Normal file
View File

View File

View File

View File

@ -1,160 +1,458 @@
fileFormatVersion: 2
guid: d406f8f3cbe268f4e9d0234d45cca60c
ModelImporter:
serializedVersion: 23
fileIDToRecycleName:
100000: Arm1
100002: ArmPlacement_Left
100004: ArmPlacement_Right
100006: ArmPlacement_Upper
100008: ArmPosition_Left
100010: ArmPosition_Right
100012: AssaultRifle
100014: BackPack
100016: Backpack1
100018: Body1
100020: Chest
100022: //RootNode
100024: Foot_Left
100026: Foot_Right
100028: Hand_Left
100030: Hand_Right
100032: Head
100034: head1
100036: Headgear_Left
100038: Headgear_Right
100040: Hips
100042: Index_Distal_Left
100044: Index_Distal_Right
100046: Index_Intermediate_Left
100048: Index_Intermediate_Right
100050: Index_Proximal_Left
100052: Index_Proximal_Right
100054: Leg1
100056: LowerArm_Left
100058: LowerArm_Right
100060: LowerLeg_Left
100062: LowerLeg_Right
100064: magazine_Right
100066: Neck
100068: RestOfFingers_Distal_Left
100070: RestOfFingers_Distal_Right
100072: RestOfFingers_Intermediate_Left
100074: RestOfFingers_Intermediate_Right
100076: RestOfFingers_Proximal_Left
100078: RestOfFingers_Proximal_Right
100080: Shoulder_Left
100082: Shoulder_Right
100084: ShoulderPadBlade_Left
100086: ShoulderPadBlade_Right
100088: ShoulderPadBody_Left
100090: ShoulderPadBody_Right
100092: ShoulderPadCTRL_Left
100094: ShoulderPadCTRL_Right
100096: Spine
100098: Thumb_Distal_Left
100100: Thumb_Distal_Right
100102: Thumb_Intermediate_Left
100104: Thumb_Intermediate_Right
100106: Thumb_Proximal_Left
100108: Thumb_Proximal_Right
100110: Toe_Left
100112: Toe_Right
100114: Toetip_Left
100116: Toetip_Right
100118: Trigger_Right
100120: UpperArm_Left
100122: UpperArm_Right
100124: UpperLeg_Left
100126: UpperLeg_Right
400000: Arm1
400002: ArmPlacement_Left
400004: ArmPlacement_Right
400006: ArmPlacement_Upper
400008: ArmPosition_Left
400010: ArmPosition_Right
400012: AssaultRifle
400014: BackPack
400016: Backpack1
400018: Body1
400020: Chest
400022: //RootNode
400024: Foot_Left
400026: Foot_Right
400028: Hand_Left
400030: Hand_Right
400032: Head
400034: head1
400036: Headgear_Left
400038: Headgear_Right
400040: Hips
400042: Index_Distal_Left
400044: Index_Distal_Right
400046: Index_Intermediate_Left
400048: Index_Intermediate_Right
400050: Index_Proximal_Left
400052: Index_Proximal_Right
400054: Leg1
400056: LowerArm_Left
400058: LowerArm_Right
400060: LowerLeg_Left
400062: LowerLeg_Right
400064: magazine_Right
400066: Neck
400068: RestOfFingers_Distal_Left
400070: RestOfFingers_Distal_Right
400072: RestOfFingers_Intermediate_Left
400074: RestOfFingers_Intermediate_Right
400076: RestOfFingers_Proximal_Left
400078: RestOfFingers_Proximal_Right
400080: Shoulder_Left
400082: Shoulder_Right
400084: ShoulderPadBlade_Left
400086: ShoulderPadBlade_Right
400088: ShoulderPadBody_Left
400090: ShoulderPadBody_Right
400092: ShoulderPadCTRL_Left
400094: ShoulderPadCTRL_Right
400096: Spine
400098: Thumb_Distal_Left
400100: Thumb_Distal_Right
400102: Thumb_Intermediate_Left
400104: Thumb_Intermediate_Right
400106: Thumb_Proximal_Left
400108: Thumb_Proximal_Right
400110: Toe_Left
400112: Toe_Right
400114: Toetip_Left
400116: Toetip_Right
400118: Trigger_Right
400120: UpperArm_Left
400122: UpperArm_Right
400124: UpperLeg_Left
400126: UpperLeg_Right
2100000: w_h_01
2100002: w_b_01
2100004: w_bp_01
2100006: w_a_01
2100008: w_f_01
2100010: w_w_01
4300000: head1
4300002: Body1
4300004: Backpack1
4300006: Arm1
4300008: Leg1
4300010: AssaultRifle
7400000: Die
9500000: //RootNode
13700000: Arm1
13700002: AssaultRifle
13700004: Backpack1
13700006: Body1
13700008: head1
13700010: Leg1
2186277476908879412: ImportLogs
serializedVersion: 19301
internalIDToNameTable:
- first:
1: 100000
second: Arm1
- first:
1: 100002
second: ArmPlacement_Left
- first:
1: 100004
second: ArmPlacement_Right
- first:
1: 100006
second: ArmPlacement_Upper
- first:
1: 100008
second: ArmPosition_Left
- first:
1: 100010
second: ArmPosition_Right
- first:
1: 100012
second: AssaultRifle
- first:
1: 100014
second: BackPack
- first:
1: 100016
second: Backpack1
- first:
1: 100018
second: Body1
- first:
1: 100020
second: Chest
- first:
1: 100022
second: //RootNode
- first:
1: 100024
second: Foot_Left
- first:
1: 100026
second: Foot_Right
- first:
1: 100028
second: Hand_Left
- first:
1: 100030
second: Hand_Right
- first:
1: 100032
second: Head
- first:
1: 100034
second: head1
- first:
1: 100036
second: Headgear_Left
- first:
1: 100038
second: Headgear_Right
- first:
1: 100040
second: Hips
- first:
1: 100042
second: Index_Distal_Left
- first:
1: 100044
second: Index_Distal_Right
- first:
1: 100046
second: Index_Intermediate_Left
- first:
1: 100048
second: Index_Intermediate_Right
- first:
1: 100050
second: Index_Proximal_Left
- first:
1: 100052
second: Index_Proximal_Right
- first:
1: 100054
second: Leg1
- first:
1: 100056
second: LowerArm_Left
- first:
1: 100058
second: LowerArm_Right
- first:
1: 100060
second: LowerLeg_Left
- first:
1: 100062
second: LowerLeg_Right
- first:
1: 100064
second: magazine_Right
- first:
1: 100066
second: Neck
- first:
1: 100068
second: RestOfFingers_Distal_Left
- first:
1: 100070
second: RestOfFingers_Distal_Right
- first:
1: 100072
second: RestOfFingers_Intermediate_Left
- first:
1: 100074
second: RestOfFingers_Intermediate_Right
- first:
1: 100076
second: RestOfFingers_Proximal_Left
- first:
1: 100078
second: RestOfFingers_Proximal_Right
- first:
1: 100080
second: Shoulder_Left
- first:
1: 100082
second: Shoulder_Right
- first:
1: 100084
second: ShoulderPadBlade_Left
- first:
1: 100086
second: ShoulderPadBlade_Right
- first:
1: 100088
second: ShoulderPadBody_Left
- first:
1: 100090
second: ShoulderPadBody_Right
- first:
1: 100092
second: ShoulderPadCTRL_Left
- first:
1: 100094
second: ShoulderPadCTRL_Right
- first:
1: 100096
second: Spine
- first:
1: 100098
second: Thumb_Distal_Left
- first:
1: 100100
second: Thumb_Distal_Right
- first:
1: 100102
second: Thumb_Intermediate_Left
- first:
1: 100104
second: Thumb_Intermediate_Right
- first:
1: 100106
second: Thumb_Proximal_Left
- first:
1: 100108
second: Thumb_Proximal_Right
- first:
1: 100110
second: Toe_Left
- first:
1: 100112
second: Toe_Right
- first:
1: 100114
second: Toetip_Left
- first:
1: 100116
second: Toetip_Right
- first:
1: 100118
second: Trigger_Right
- first:
1: 100120
second: UpperArm_Left
- first:
1: 100122
second: UpperArm_Right
- first:
1: 100124
second: UpperLeg_Left
- first:
1: 100126
second: UpperLeg_Right
- first:
4: 400000
second: Arm1
- first:
4: 400002
second: ArmPlacement_Left
- first:
4: 400004
second: ArmPlacement_Right
- first:
4: 400006
second: ArmPlacement_Upper
- first:
4: 400008
second: ArmPosition_Left
- first:
4: 400010
second: ArmPosition_Right
- first:
4: 400012
second: AssaultRifle
- first:
4: 400014
second: BackPack
- first:
4: 400016
second: Backpack1
- first:
4: 400018
second: Body1
- first:
4: 400020
second: Chest
- first:
4: 400022
second: //RootNode
- first:
4: 400024
second: Foot_Left
- first:
4: 400026
second: Foot_Right
- first:
4: 400028
second: Hand_Left
- first:
4: 400030
second: Hand_Right
- first:
4: 400032
second: Head
- first:
4: 400034
second: head1
- first:
4: 400036
second: Headgear_Left
- first:
4: 400038
second: Headgear_Right
- first:
4: 400040
second: Hips
- first:
4: 400042
second: Index_Distal_Left
- first:
4: 400044
second: Index_Distal_Right
- first:
4: 400046
second: Index_Intermediate_Left
- first:
4: 400048
second: Index_Intermediate_Right
- first:
4: 400050
second: Index_Proximal_Left
- first:
4: 400052
second: Index_Proximal_Right
- first:
4: 400054
second: Leg1
- first:
4: 400056
second: LowerArm_Left
- first:
4: 400058
second: LowerArm_Right
- first:
4: 400060
second: LowerLeg_Left
- first:
4: 400062
second: LowerLeg_Right
- first:
4: 400064
second: magazine_Right
- first:
4: 400066
second: Neck
- first:
4: 400068
second: RestOfFingers_Distal_Left
- first:
4: 400070
second: RestOfFingers_Distal_Right
- first:
4: 400072
second: RestOfFingers_Intermediate_Left
- first:
4: 400074
second: RestOfFingers_Intermediate_Right
- first:
4: 400076
second: RestOfFingers_Proximal_Left
- first:
4: 400078
second: RestOfFingers_Proximal_Right
- first:
4: 400080
second: Shoulder_Left
- first:
4: 400082
second: Shoulder_Right
- first:
4: 400084
second: ShoulderPadBlade_Left
- first:
4: 400086
second: ShoulderPadBlade_Right
- first:
4: 400088
second: ShoulderPadBody_Left
- first:
4: 400090
second: ShoulderPadBody_Right
- first:
4: 400092
second: ShoulderPadCTRL_Left
- first:
4: 400094
second: ShoulderPadCTRL_Right
- first:
4: 400096
second: Spine
- first:
4: 400098
second: Thumb_Distal_Left
- first:
4: 400100
second: Thumb_Distal_Right
- first:
4: 400102
second: Thumb_Intermediate_Left
- first:
4: 400104
second: Thumb_Intermediate_Right
- first:
4: 400106
second: Thumb_Proximal_Left
- first:
4: 400108
second: Thumb_Proximal_Right
- first:
4: 400110
second: Toe_Left
- first:
4: 400112
second: Toe_Right
- first:
4: 400114
second: Toetip_Left
- first:
4: 400116
second: Toetip_Right
- first:
4: 400118
second: Trigger_Right
- first:
4: 400120
second: UpperArm_Left
- first:
4: 400122
second: UpperArm_Right
- first:
4: 400124
second: UpperLeg_Left
- first:
4: 400126
second: UpperLeg_Right
- first:
21: 2100000
second: w_h_01
- first:
21: 2100002
second: w_b_01
- first:
21: 2100004
second: w_bp_01
- first:
21: 2100006
second: w_a_01
- first:
21: 2100008
second: w_f_01
- first:
21: 2100010
second: w_w_01
- first:
43: 4300000
second: head1
- first:
43: 4300002
second: Body1
- first:
43: 4300004
second: Backpack1
- first:
43: 4300006
second: Arm1
- first:
43: 4300008
second: Leg1
- first:
43: 4300010
second: AssaultRifle
- first:
74: 7400000
second: Die
- first:
95: 9500000
second: //RootNode
- first:
137: 13700000
second: Arm1
- first:
137: 13700002
second: AssaultRifle
- first:
137: 13700004
second: Backpack1
- first:
137: 13700006
second: Body1
- first:
137: 13700008
second: head1
- first:
137: 13700010
second: Leg1
- first:
41386430: 2186277476908879412
second: ImportLogs
externalObjects: {}
materials:
importMaterials: 1
materialImportMode: 1
materialName: 0
materialSearch: 1
materialLocation: 1
@ -183,6 +481,7 @@ ModelImporter:
- serializedVersion: 16
name: Die
takeName: Take 001
internalID: 0
firstFrame: 0
lastFrame: 32
wrapMode: 0
@ -343,25 +642,28 @@ ModelImporter:
meshCompression: 0
addColliders: 0
useSRGBMaterialColor: 1
sortHierarchyByName: 1
importVisibility: 1
importBlendShapes: 1
importCameras: 1
importLights: 1
fileIdsGeneration: 1
swapUVChannels: 0
generateSecondaryUV: 0
useFileUnits: 1
optimizeMeshForGPU: 1
keepQuads: 0
weldVertices: 1
preserveHierarchy: 0
skinWeightsMode: 0
maxBonesPerVertex: 4
minBoneWeight: 0.001
meshOptimizationFlags: -1
indexFormat: 0
secondaryUVAngleDistortion: 8
secondaryUVAreaDistortion: 15.000001
secondaryUVHardAngle: 88
secondaryUVPackMargin: 4
useFileScale: 1
previousCalculatedGlobalScale: 1
hasPreviousCalculatedGlobalScale: 1
tangentSpace:
normalSmoothAngle: 60
normalImportMode: 0
@ -370,10 +672,10 @@ ModelImporter:
legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0
blendShapeNormalImportMode: 1
normalSmoothingSource: 0
referencedClips: []
importAnimation: 1
copyAvatar: 0
humanDescription:
serializedVersion: 2
serializedVersion: 3
human:
- boneName: Hips
humanName: Hips
@ -1015,13 +1317,16 @@ ModelImporter:
armStretch: 0.05
legStretch: 0.05
feetSpacing: 0
globalScale: 1
rootMotionBoneName:
hasTranslationDoF: 0
hasExtraRoot: 1
skeletonHasParents: 1
lastHumanDescriptionAvatarSource: {instanceID: 0}
autoGenerateAvatarMappingIfUnspecified: 1
animationType: 3
humanoidOversampling: 1
avatarSetup: 1
additionalBone: 0
userData:
assetBundleName:

View File

@ -1,160 +1,458 @@
fileFormatVersion: 2
guid: 3ad7c5979f6586d4a9532a55492a0ebe
ModelImporter:
serializedVersion: 23
fileIDToRecycleName:
100000: Arm1
100002: ArmPlacement_Left
100004: ArmPlacement_Right
100006: ArmPlacement_Upper
100008: ArmPosition_Left
100010: ArmPosition_Right
100012: AssaultRifle
100014: BackPack
100016: Backpack1
100018: Body1
100020: Chest
100022: Foot_Left
100024: Foot_Right
100026: Hand_Left
100028: Hand_Right
100030: Head
100032: head1
100034: Headgear_Left
100036: Headgear_Right
100038: Hips
100040: //RootNode
100042: Index_Distal_Left
100044: Index_Distal_Right
100046: Index_Intermediate_Left
100048: Index_Intermediate_Right
100050: Index_Proximal_Left
100052: Index_Proximal_Right
100054: Leg1
100056: LowerArm_Left
100058: LowerArm_Right
100060: LowerLeg_Left
100062: LowerLeg_Right
100064: magazine_Right
100066: Neck
100068: RestOfFingers_Distal_Left
100070: RestOfFingers_Distal_Right
100072: RestOfFingers_Intermediate_Left
100074: RestOfFingers_Intermediate_Right
100076: RestOfFingers_Proximal_Left
100078: RestOfFingers_Proximal_Right
100080: Shoulder_Left
100082: Shoulder_Right
100084: ShoulderPadBlade_Left
100086: ShoulderPadBlade_Right
100088: ShoulderPadBody_Left
100090: ShoulderPadBody_Right
100092: ShoulderPadCTRL_Left
100094: ShoulderPadCTRL_Right
100096: Spine
100098: Thumb_Distal_Left
100100: Thumb_Distal_Right
100102: Thumb_Intermediate_Left
100104: Thumb_Intermediate_Right
100106: Thumb_Proximal_Left
100108: Thumb_Proximal_Right
100110: Toe_Left
100112: Toe_Right
100114: Toetip_Left
100116: Toetip_Right
100118: Trigger_Right
100120: UpperArm_Left
100122: UpperArm_Right
100124: UpperLeg_Left
100126: UpperLeg_Right
400000: Arm1
400002: ArmPlacement_Left
400004: ArmPlacement_Right
400006: ArmPlacement_Upper
400008: ArmPosition_Left
400010: ArmPosition_Right
400012: AssaultRifle
400014: BackPack
400016: Backpack1
400018: Body1
400020: Chest
400022: Foot_Left
400024: Foot_Right
400026: Hand_Left
400028: Hand_Right
400030: Head
400032: head1
400034: Headgear_Left
400036: Headgear_Right
400038: Hips
400040: //RootNode
400042: Index_Distal_Left
400044: Index_Distal_Right
400046: Index_Intermediate_Left
400048: Index_Intermediate_Right
400050: Index_Proximal_Left
400052: Index_Proximal_Right
400054: Leg1
400056: LowerArm_Left
400058: LowerArm_Right
400060: LowerLeg_Left
400062: LowerLeg_Right
400064: magazine_Right
400066: Neck
400068: RestOfFingers_Distal_Left
400070: RestOfFingers_Distal_Right
400072: RestOfFingers_Intermediate_Left
400074: RestOfFingers_Intermediate_Right
400076: RestOfFingers_Proximal_Left
400078: RestOfFingers_Proximal_Right
400080: Shoulder_Left
400082: Shoulder_Right
400084: ShoulderPadBlade_Left
400086: ShoulderPadBlade_Right
400088: ShoulderPadBody_Left
400090: ShoulderPadBody_Right
400092: ShoulderPadCTRL_Left
400094: ShoulderPadCTRL_Right
400096: Spine
400098: Thumb_Distal_Left
400100: Thumb_Distal_Right
400102: Thumb_Intermediate_Left
400104: Thumb_Intermediate_Right
400106: Thumb_Proximal_Left
400108: Thumb_Proximal_Right
400110: Toe_Left
400112: Toe_Right
400114: Toetip_Left
400116: Toetip_Right
400118: Trigger_Right
400120: UpperArm_Left
400122: UpperArm_Right
400124: UpperLeg_Left
400126: UpperLeg_Right
2100000: w_h_01
2100002: w_b_01
2100004: w_bp_01
2100006: w_a_01
2100008: w_f_01
2100010: w_w_01
4300000: head1
4300002: Body1
4300004: Backpack1
4300006: Arm1
4300008: Leg1
4300010: AssaultRifle
7400000: Idle_Ducking_AR
9500000: //RootNode
13700000: Arm1
13700002: AssaultRifle
13700004: Backpack1
13700006: Body1
13700008: head1
13700010: Leg1
2186277476908879412: ImportLogs
serializedVersion: 19301
internalIDToNameTable:
- first:
1: 100000
second: Arm1
- first:
1: 100002
second: ArmPlacement_Left
- first:
1: 100004
second: ArmPlacement_Right
- first:
1: 100006
second: ArmPlacement_Upper
- first:
1: 100008
second: ArmPosition_Left
- first:
1: 100010
second: ArmPosition_Right
- first:
1: 100012
second: AssaultRifle
- first:
1: 100014
second: BackPack
- first:
1: 100016
second: Backpack1
- first:
1: 100018
second: Body1
- first:
1: 100020
second: Chest
- first:
1: 100022
second: Foot_Left
- first:
1: 100024
second: Foot_Right
- first:
1: 100026
second: Hand_Left
- first:
1: 100028
second: Hand_Right
- first:
1: 100030
second: Head
- first:
1: 100032
second: head1
- first:
1: 100034
second: Headgear_Left
- first:
1: 100036
second: Headgear_Right
- first:
1: 100038
second: Hips
- first:
1: 100040
second: //RootNode
- first:
1: 100042
second: Index_Distal_Left
- first:
1: 100044
second: Index_Distal_Right
- first:
1: 100046
second: Index_Intermediate_Left
- first:
1: 100048
second: Index_Intermediate_Right
- first:
1: 100050
second: Index_Proximal_Left
- first:
1: 100052
second: Index_Proximal_Right
- first:
1: 100054
second: Leg1
- first:
1: 100056
second: LowerArm_Left
- first:
1: 100058
second: LowerArm_Right
- first:
1: 100060
second: LowerLeg_Left
- first:
1: 100062
second: LowerLeg_Right
- first:
1: 100064
second: magazine_Right
- first:
1: 100066
second: Neck
- first:
1: 100068
second: RestOfFingers_Distal_Left
- first:
1: 100070
second: RestOfFingers_Distal_Right
- first:
1: 100072
second: RestOfFingers_Intermediate_Left
- first:
1: 100074
second: RestOfFingers_Intermediate_Right
- first:
1: 100076
second: RestOfFingers_Proximal_Left
- first:
1: 100078
second: RestOfFingers_Proximal_Right
- first:
1: 100080
second: Shoulder_Left
- first:
1: 100082
second: Shoulder_Right
- first:
1: 100084
second: ShoulderPadBlade_Left
- first:
1: 100086
second: ShoulderPadBlade_Right
- first:
1: 100088
second: ShoulderPadBody_Left
- first:
1: 100090
second: ShoulderPadBody_Right
- first:
1: 100092
second: ShoulderPadCTRL_Left
- first:
1: 100094
second: ShoulderPadCTRL_Right
- first:
1: 100096
second: Spine
- first:
1: 100098
second: Thumb_Distal_Left
- first:
1: 100100
second: Thumb_Distal_Right
- first:
1: 100102
second: Thumb_Intermediate_Left
- first:
1: 100104
second: Thumb_Intermediate_Right
- first:
1: 100106
second: Thumb_Proximal_Left
- first:
1: 100108
second: Thumb_Proximal_Right
- first:
1: 100110
second: Toe_Left
- first:
1: 100112
second: Toe_Right
- first:
1: 100114
second: Toetip_Left
- first:
1: 100116
second: Toetip_Right
- first:
1: 100118
second: Trigger_Right
- first:
1: 100120
second: UpperArm_Left
- first:
1: 100122
second: UpperArm_Right
- first:
1: 100124
second: UpperLeg_Left
- first:
1: 100126
second: UpperLeg_Right
- first:
4: 400000
second: Arm1
- first:
4: 400002
second: ArmPlacement_Left
- first:
4: 400004
second: ArmPlacement_Right
- first:
4: 400006
second: ArmPlacement_Upper
- first:
4: 400008
second: ArmPosition_Left
- first:
4: 400010
second: ArmPosition_Right
- first:
4: 400012
second: AssaultRifle
- first:
4: 400014
second: BackPack
- first:
4: 400016
second: Backpack1
- first:
4: 400018
second: Body1
- first:
4: 400020
second: Chest
- first:
4: 400022
second: Foot_Left
- first:
4: 400024
second: Foot_Right
- first:
4: 400026
second: Hand_Left
- first:
4: 400028
second: Hand_Right
- first:
4: 400030
second: Head
- first:
4: 400032
second: head1
- first:
4: 400034
second: Headgear_Left
- first:
4: 400036
second: Headgear_Right
- first:
4: 400038
second: Hips
- first:
4: 400040
second: //RootNode
- first:
4: 400042
second: Index_Distal_Left
- first:
4: 400044
second: Index_Distal_Right
- first:
4: 400046
second: Index_Intermediate_Left
- first:
4: 400048
second: Index_Intermediate_Right
- first:
4: 400050
second: Index_Proximal_Left
- first:
4: 400052
second: Index_Proximal_Right
- first:
4: 400054
second: Leg1
- first:
4: 400056
second: LowerArm_Left
- first:
4: 400058
second: LowerArm_Right
- first:
4: 400060
second: LowerLeg_Left
- first:
4: 400062
second: LowerLeg_Right
- first:
4: 400064
second: magazine_Right
- first:
4: 400066
second: Neck
- first:
4: 400068
second: RestOfFingers_Distal_Left
- first:
4: 400070
second: RestOfFingers_Distal_Right
- first:
4: 400072
second: RestOfFingers_Intermediate_Left
- first:
4: 400074
second: RestOfFingers_Intermediate_Right
- first:
4: 400076
second: RestOfFingers_Proximal_Left
- first:
4: 400078
second: RestOfFingers_Proximal_Right
- first:
4: 400080
second: Shoulder_Left
- first:
4: 400082
second: Shoulder_Right
- first:
4: 400084
second: ShoulderPadBlade_Left
- first:
4: 400086
second: ShoulderPadBlade_Right
- first:
4: 400088
second: ShoulderPadBody_Left
- first:
4: 400090
second: ShoulderPadBody_Right
- first:
4: 400092
second: ShoulderPadCTRL_Left
- first:
4: 400094
second: ShoulderPadCTRL_Right
- first:
4: 400096
second: Spine
- first:
4: 400098
second: Thumb_Distal_Left
- first:
4: 400100
second: Thumb_Distal_Right
- first:
4: 400102
second: Thumb_Intermediate_Left
- first:
4: 400104
second: Thumb_Intermediate_Right
- first:
4: 400106
second: Thumb_Proximal_Left
- first:
4: 400108
second: Thumb_Proximal_Right
- first:
4: 400110
second: Toe_Left
- first:
4: 400112
second: Toe_Right
- first:
4: 400114
second: Toetip_Left
- first:
4: 400116
second: Toetip_Right
- first:
4: 400118
second: Trigger_Right
- first:
4: 400120
second: UpperArm_Left
- first:
4: 400122
second: UpperArm_Right
- first:
4: 400124
second: UpperLeg_Left
- first:
4: 400126
second: UpperLeg_Right
- first:
21: 2100000
second: w_h_01
- first:
21: 2100002
second: w_b_01
- first:
21: 2100004
second: w_bp_01
- first:
21: 2100006
second: w_a_01
- first:
21: 2100008
second: w_f_01
- first:
21: 2100010
second: w_w_01
- first:
43: 4300000
second: head1
- first:
43: 4300002
second: Body1
- first:
43: 4300004
second: Backpack1
- first:
43: 4300006
second: Arm1
- first:
43: 4300008
second: Leg1
- first:
43: 4300010
second: AssaultRifle
- first:
74: 7400000
second: Idle_Ducking_AR
- first:
95: 9500000
second: //RootNode
- first:
137: 13700000
second: Arm1
- first:
137: 13700002
second: AssaultRifle
- first:
137: 13700004
second: Backpack1
- first:
137: 13700006
second: Body1
- first:
137: 13700008
second: head1
- first:
137: 13700010
second: Leg1
- first:
41386430: 2186277476908879412
second: ImportLogs
externalObjects: {}
materials:
importMaterials: 1
materialImportMode: 1
materialName: 0
materialSearch: 1
materialLocation: 1
@ -183,6 +481,7 @@ ModelImporter:
- serializedVersion: 16
name: Idle_Ducking_AR
takeName: Take 001
internalID: 0
firstFrame: 0
lastFrame: 30
wrapMode: 0
@ -191,12 +490,12 @@ ModelImporter:
cycleOffset: 0
loop: 0
hasAdditiveReferencePose: 0
loopTime: 1
loopTime: 0
loopBlend: 0
loopBlendOrientation: 1
loopBlendPositionY: 1
loopBlendPositionXZ: 1
keepOriginalOrientation: 1
keepOriginalOrientation: 0
keepOriginalPositionY: 1
keepOriginalPositionXZ: 1
heightFromFeet: 0
@ -343,25 +642,28 @@ ModelImporter:
meshCompression: 0
addColliders: 0
useSRGBMaterialColor: 1
sortHierarchyByName: 1
importVisibility: 1
importBlendShapes: 1
importCameras: 1
importLights: 1
fileIdsGeneration: 1
swapUVChannels: 0
generateSecondaryUV: 0
useFileUnits: 1
optimizeMeshForGPU: 1
keepQuads: 0
weldVertices: 1
preserveHierarchy: 0
skinWeightsMode: 0
maxBonesPerVertex: 4
minBoneWeight: 0.001
meshOptimizationFlags: -1
indexFormat: 0
secondaryUVAngleDistortion: 8
secondaryUVAreaDistortion: 15.000001
secondaryUVHardAngle: 88
secondaryUVPackMargin: 4
useFileScale: 1
previousCalculatedGlobalScale: 1
hasPreviousCalculatedGlobalScale: 1
tangentSpace:
normalSmoothAngle: 60
normalImportMode: 0
@ -370,10 +672,10 @@ ModelImporter:
legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0
blendShapeNormalImportMode: 1
normalSmoothingSource: 0
referencedClips: []
importAnimation: 1
copyAvatar: 0
humanDescription:
serializedVersion: 2
serializedVersion: 3
human:
- boneName: Hips
humanName: Hips
@ -1015,13 +1317,16 @@ ModelImporter:
armStretch: 0.05
legStretch: 0.05
feetSpacing: 0
globalScale: 1
rootMotionBoneName:
hasTranslationDoF: 0
hasExtraRoot: 1
skeletonHasParents: 1
lastHumanDescriptionAvatarSource: {instanceID: 0}
autoGenerateAvatarMappingIfUnspecified: 1
animationType: 3
humanoidOversampling: 1
avatarSetup: 1
additionalBone: 0
userData:
assetBundleName:

View File

@ -1,160 +1,458 @@
fileFormatVersion: 2
guid: 107649059ea401b4e9c5c20f21e99a55
ModelImporter:
serializedVersion: 23
fileIDToRecycleName:
100000: Arm1
100002: ArmPlacement_Left
100004: ArmPlacement_Right
100006: ArmPlacement_Upper
100008: ArmPosition_Left
100010: ArmPosition_Right
100012: AssaultRifle
100014: BackPack
100016: Backpack1
100018: Body1
100020: Chest
100022: Foot_Left
100024: Foot_Right
100026: Hand_Left
100028: Hand_Right
100030: Head
100032: head1
100034: Headgear_Left
100036: Headgear_Right
100038: Hips
100040: //RootNode
100042: Index_Distal_Left
100044: Index_Distal_Right
100046: Index_Intermediate_Left
100048: Index_Intermediate_Right
100050: Index_Proximal_Left
100052: Index_Proximal_Right
100054: Leg1
100056: LowerArm_Left
100058: LowerArm_Right
100060: LowerLeg_Left
100062: LowerLeg_Right
100064: magazine_Right
100066: Neck
100068: RestOfFingers_Distal_Left
100070: RestOfFingers_Distal_Right
100072: RestOfFingers_Intermediate_Left
100074: RestOfFingers_Intermediate_Right
100076: RestOfFingers_Proximal_Left
100078: RestOfFingers_Proximal_Right
100080: Shoulder_Left
100082: Shoulder_Right
100084: ShoulderPadBlade_Left
100086: ShoulderPadBlade_Right
100088: ShoulderPadBody_Left
100090: ShoulderPadBody_Right
100092: ShoulderPadCTRL_Left
100094: ShoulderPadCTRL_Right
100096: Spine
100098: Thumb_Distal_Left
100100: Thumb_Distal_Right
100102: Thumb_Intermediate_Left
100104: Thumb_Intermediate_Right
100106: Thumb_Proximal_Left
100108: Thumb_Proximal_Right
100110: Toe_Left
100112: Toe_Right
100114: Toetip_Left
100116: Toetip_Right
100118: Trigger_Right
100120: UpperArm_Left
100122: UpperArm_Right
100124: UpperLeg_Left
100126: UpperLeg_Right
400000: Arm1
400002: ArmPlacement_Left
400004: ArmPlacement_Right
400006: ArmPlacement_Upper
400008: ArmPosition_Left
400010: ArmPosition_Right
400012: AssaultRifle
400014: BackPack
400016: Backpack1
400018: Body1
400020: Chest
400022: Foot_Left
400024: Foot_Right
400026: Hand_Left
400028: Hand_Right
400030: Head
400032: head1
400034: Headgear_Left
400036: Headgear_Right
400038: Hips
400040: //RootNode
400042: Index_Distal_Left
400044: Index_Distal_Right
400046: Index_Intermediate_Left
400048: Index_Intermediate_Right
400050: Index_Proximal_Left
400052: Index_Proximal_Right
400054: Leg1
400056: LowerArm_Left
400058: LowerArm_Right
400060: LowerLeg_Left
400062: LowerLeg_Right
400064: magazine_Right
400066: Neck
400068: RestOfFingers_Distal_Left
400070: RestOfFingers_Distal_Right
400072: RestOfFingers_Intermediate_Left
400074: RestOfFingers_Intermediate_Right
400076: RestOfFingers_Proximal_Left
400078: RestOfFingers_Proximal_Right
400080: Shoulder_Left
400082: Shoulder_Right
400084: ShoulderPadBlade_Left
400086: ShoulderPadBlade_Right
400088: ShoulderPadBody_Left
400090: ShoulderPadBody_Right
400092: ShoulderPadCTRL_Left
400094: ShoulderPadCTRL_Right
400096: Spine
400098: Thumb_Distal_Left
400100: Thumb_Distal_Right
400102: Thumb_Intermediate_Left
400104: Thumb_Intermediate_Right
400106: Thumb_Proximal_Left
400108: Thumb_Proximal_Right
400110: Toe_Left
400112: Toe_Right
400114: Toetip_Left
400116: Toetip_Right
400118: Trigger_Right
400120: UpperArm_Left
400122: UpperArm_Right
400124: UpperLeg_Left
400126: UpperLeg_Right
2100000: w_h_01
2100002: w_b_01
2100004: w_bp_01
2100006: w_a_01
2100008: w_f_01
2100010: w_w_01
4300000: head1
4300002: Body1
4300004: Backpack1
4300006: Arm1
4300008: Leg1
4300010: AssaultRifle
7400000: Idle_gunMiddle_AR
9500000: //RootNode
13700000: Arm1
13700002: AssaultRifle
13700004: Backpack1
13700006: Body1
13700008: head1
13700010: Leg1
2186277476908879412: ImportLogs
serializedVersion: 19301
internalIDToNameTable:
- first:
1: 100000
second: Arm1
- first:
1: 100002
second: ArmPlacement_Left
- first:
1: 100004
second: ArmPlacement_Right
- first:
1: 100006
second: ArmPlacement_Upper
- first:
1: 100008
second: ArmPosition_Left
- first:
1: 100010
second: ArmPosition_Right
- first:
1: 100012
second: AssaultRifle
- first:
1: 100014
second: BackPack
- first:
1: 100016
second: Backpack1
- first:
1: 100018
second: Body1
- first:
1: 100020
second: Chest
- first:
1: 100022
second: Foot_Left
- first:
1: 100024
second: Foot_Right
- first:
1: 100026
second: Hand_Left
- first:
1: 100028
second: Hand_Right
- first:
1: 100030
second: Head
- first:
1: 100032
second: head1
- first:
1: 100034
second: Headgear_Left
- first:
1: 100036
second: Headgear_Right
- first:
1: 100038
second: Hips
- first:
1: 100040
second: //RootNode
- first:
1: 100042
second: Index_Distal_Left
- first:
1: 100044
second: Index_Distal_Right
- first:
1: 100046
second: Index_Intermediate_Left
- first:
1: 100048
second: Index_Intermediate_Right
- first:
1: 100050
second: Index_Proximal_Left
- first:
1: 100052
second: Index_Proximal_Right
- first:
1: 100054
second: Leg1
- first:
1: 100056
second: LowerArm_Left
- first:
1: 100058
second: LowerArm_Right
- first:
1: 100060
second: LowerLeg_Left
- first:
1: 100062
second: LowerLeg_Right
- first:
1: 100064
second: magazine_Right
- first:
1: 100066
second: Neck
- first:
1: 100068
second: RestOfFingers_Distal_Left
- first:
1: 100070
second: RestOfFingers_Distal_Right
- first:
1: 100072
second: RestOfFingers_Intermediate_Left
- first:
1: 100074
second: RestOfFingers_Intermediate_Right
- first:
1: 100076
second: RestOfFingers_Proximal_Left
- first:
1: 100078
second: RestOfFingers_Proximal_Right
- first:
1: 100080
second: Shoulder_Left
- first:
1: 100082
second: Shoulder_Right
- first:
1: 100084
second: ShoulderPadBlade_Left
- first:
1: 100086
second: ShoulderPadBlade_Right
- first:
1: 100088
second: ShoulderPadBody_Left
- first:
1: 100090
second: ShoulderPadBody_Right
- first:
1: 100092
second: ShoulderPadCTRL_Left
- first:
1: 100094
second: ShoulderPadCTRL_Right
- first:
1: 100096
second: Spine
- first:
1: 100098
second: Thumb_Distal_Left
- first:
1: 100100
second: Thumb_Distal_Right
- first:
1: 100102
second: Thumb_Intermediate_Left
- first:
1: 100104
second: Thumb_Intermediate_Right
- first:
1: 100106
second: Thumb_Proximal_Left
- first:
1: 100108
second: Thumb_Proximal_Right
- first:
1: 100110
second: Toe_Left
- first:
1: 100112
second: Toe_Right
- first:
1: 100114
second: Toetip_Left
- first:
1: 100116
second: Toetip_Right
- first:
1: 100118
second: Trigger_Right
- first:
1: 100120
second: UpperArm_Left
- first:
1: 100122
second: UpperArm_Right
- first:
1: 100124
second: UpperLeg_Left
- first:
1: 100126
second: UpperLeg_Right
- first:
4: 400000
second: Arm1
- first:
4: 400002
second: ArmPlacement_Left
- first:
4: 400004
second: ArmPlacement_Right
- first:
4: 400006
second: ArmPlacement_Upper
- first:
4: 400008
second: ArmPosition_Left
- first:
4: 400010
second: ArmPosition_Right
- first:
4: 400012
second: AssaultRifle
- first:
4: 400014
second: BackPack
- first:
4: 400016
second: Backpack1
- first:
4: 400018
second: Body1
- first:
4: 400020
second: Chest
- first:
4: 400022
second: Foot_Left
- first:
4: 400024
second: Foot_Right
- first:
4: 400026
second: Hand_Left
- first:
4: 400028
second: Hand_Right
- first:
4: 400030
second: Head
- first:
4: 400032
second: head1
- first:
4: 400034
second: Headgear_Left
- first:
4: 400036
second: Headgear_Right
- first:
4: 400038
second: Hips
- first:
4: 400040
second: //RootNode
- first:
4: 400042
second: Index_Distal_Left
- first:
4: 400044
second: Index_Distal_Right
- first:
4: 400046
second: Index_Intermediate_Left
- first:
4: 400048
second: Index_Intermediate_Right
- first:
4: 400050
second: Index_Proximal_Left
- first:
4: 400052
second: Index_Proximal_Right
- first:
4: 400054
second: Leg1
- first:
4: 400056
second: LowerArm_Left
- first:
4: 400058
second: LowerArm_Right
- first:
4: 400060
second: LowerLeg_Left
- first:
4: 400062
second: LowerLeg_Right
- first:
4: 400064
second: magazine_Right
- first:
4: 400066
second: Neck
- first:
4: 400068
second: RestOfFingers_Distal_Left
- first:
4: 400070
second: RestOfFingers_Distal_Right
- first:
4: 400072
second: RestOfFingers_Intermediate_Left
- first:
4: 400074
second: RestOfFingers_Intermediate_Right
- first:
4: 400076
second: RestOfFingers_Proximal_Left
- first:
4: 400078
second: RestOfFingers_Proximal_Right
- first:
4: 400080
second: Shoulder_Left
- first:
4: 400082
second: Shoulder_Right
- first:
4: 400084
second: ShoulderPadBlade_Left
- first:
4: 400086
second: ShoulderPadBlade_Right
- first:
4: 400088
second: ShoulderPadBody_Left
- first:
4: 400090
second: ShoulderPadBody_Right
- first:
4: 400092
second: ShoulderPadCTRL_Left
- first:
4: 400094
second: ShoulderPadCTRL_Right
- first:
4: 400096
second: Spine
- first:
4: 400098
second: Thumb_Distal_Left
- first:
4: 400100
second: Thumb_Distal_Right
- first:
4: 400102
second: Thumb_Intermediate_Left
- first:
4: 400104
second: Thumb_Intermediate_Right
- first:
4: 400106
second: Thumb_Proximal_Left
- first:
4: 400108
second: Thumb_Proximal_Right
- first:
4: 400110
second: Toe_Left
- first:
4: 400112
second: Toe_Right
- first:
4: 400114
second: Toetip_Left
- first:
4: 400116
second: Toetip_Right
- first:
4: 400118
second: Trigger_Right
- first:
4: 400120
second: UpperArm_Left
- first:
4: 400122
second: UpperArm_Right
- first:
4: 400124
second: UpperLeg_Left
- first:
4: 400126
second: UpperLeg_Right
- first:
21: 2100000
second: w_h_01
- first:
21: 2100002
second: w_b_01
- first:
21: 2100004
second: w_bp_01
- first:
21: 2100006
second: w_a_01
- first:
21: 2100008
second: w_f_01
- first:
21: 2100010
second: w_w_01
- first:
43: 4300000
second: head1
- first:
43: 4300002
second: Body1
- first:
43: 4300004
second: Backpack1
- first:
43: 4300006
second: Arm1
- first:
43: 4300008
second: Leg1
- first:
43: 4300010
second: AssaultRifle
- first:
74: 7400000
second: Idle_gunMiddle_AR
- first:
95: 9500000
second: //RootNode
- first:
137: 13700000
second: Arm1
- first:
137: 13700002
second: AssaultRifle
- first:
137: 13700004
second: Backpack1
- first:
137: 13700006
second: Body1
- first:
137: 13700008
second: head1
- first:
137: 13700010
second: Leg1
- first:
41386430: 2186277476908879412
second: ImportLogs
externalObjects: {}
materials:
importMaterials: 1
materialImportMode: 1
materialName: 0
materialSearch: 1
materialLocation: 1
@ -183,6 +481,7 @@ ModelImporter:
- serializedVersion: 16
name: Idle_gunMiddle_AR
takeName: Take 001
internalID: 0
firstFrame: 0
lastFrame: 40
wrapMode: 0
@ -343,25 +642,28 @@ ModelImporter:
meshCompression: 0
addColliders: 0
useSRGBMaterialColor: 1
sortHierarchyByName: 1
importVisibility: 1
importBlendShapes: 1
importCameras: 1
importLights: 1
fileIdsGeneration: 1
swapUVChannels: 0
generateSecondaryUV: 0
useFileUnits: 1
optimizeMeshForGPU: 1
keepQuads: 0
weldVertices: 1
preserveHierarchy: 0
skinWeightsMode: 0
maxBonesPerVertex: 4
minBoneWeight: 0.001
meshOptimizationFlags: -1
indexFormat: 0
secondaryUVAngleDistortion: 8
secondaryUVAreaDistortion: 15.000001
secondaryUVHardAngle: 88
secondaryUVPackMargin: 4
useFileScale: 1
previousCalculatedGlobalScale: 1
hasPreviousCalculatedGlobalScale: 1
tangentSpace:
normalSmoothAngle: 60
normalImportMode: 0
@ -370,10 +672,10 @@ ModelImporter:
legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0
blendShapeNormalImportMode: 1
normalSmoothingSource: 0
referencedClips: []
importAnimation: 1
copyAvatar: 0
humanDescription:
serializedVersion: 2
serializedVersion: 3
human:
- boneName: Hips
humanName: Hips
@ -1015,13 +1317,16 @@ ModelImporter:
armStretch: 0.05
legStretch: 0.05
feetSpacing: 0
globalScale: 1
rootMotionBoneName:
hasTranslationDoF: 0
hasExtraRoot: 1
skeletonHasParents: 1
lastHumanDescriptionAvatarSource: {instanceID: 0}
autoGenerateAvatarMappingIfUnspecified: 1
animationType: 3
humanoidOversampling: 1
avatarSetup: 1
additionalBone: 0
userData:
assetBundleName:

View File

@ -0,0 +1,93 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!206 &-2926378548289824311
BlendTree:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Blend Tree
m_Childs: []
m_BlendParameter: Blend
m_BlendParameterY: Blend
m_MinThreshold: 0
m_MaxThreshold: 1
m_UseAutomaticThresholds: 1
m_NormalizedBlendValues: 0
m_BlendType: 0
--- !u!91 &9100000
AnimatorController:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: SciFiWarrior
serializedVersion: 5
m_AnimatorParameters:
- m_Name: Blend
m_Type: 1
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 0}
m_AnimatorLayers:
- serializedVersion: 5
m_Name: Base Layer
m_StateMachine: {fileID: 1107476691846109156}
m_Mask: {fileID: 0}
m_Motions: []
m_Behaviours: []
m_BlendingMode: 0
m_SyncedLayerIndex: -1
m_DefaultWeight: 0
m_IKPass: 0
m_SyncedLayerAffectsTiming: 0
m_Controller: {fileID: 9100000}
--- !u!1107 &1107476691846109156
AnimatorStateMachine:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Base Layer
m_ChildStates:
- serializedVersion: 1
m_State: {fileID: 5405818589905925533}
m_Position: {x: 353.98297, y: 140.66443, z: 0}
m_ChildStateMachines: []
m_AnyStateTransitions: []
m_EntryTransitions: []
m_StateMachineTransitions: {}
m_StateMachineBehaviours: []
m_AnyStatePosition: {x: 50, y: 20, z: 0}
m_EntryPosition: {x: 50, y: 120, z: 0}
m_ExitPosition: {x: 48, y: 72, z: 0}
m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
m_DefaultState: {fileID: 5405818589905925533}
--- !u!1102 &5405818589905925533
AnimatorState:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Blend Tree
m_Speed: 1
m_CycleOffset: 0
m_Transitions: []
m_StateMachineBehaviours: []
m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0
m_WriteDefaultValues: 1
m_Mirror: 0
m_SpeedParameterActive: 0
m_MirrorParameterActive: 0
m_CycleOffsetParameterActive: 0
m_TimeParameterActive: 0
m_Motion: {fileID: 7400000, guid: 107649059ea401b4e9c5c20f21e99a55, type: 3}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:

View File

@ -1,89 +1,89 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!21 &2100000
Material:
serializedVersion: 6
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_Name: Skybox_Mat
m_Shader: {fileID: 106, guid: 0000000000000000f000000000000000, type: 0}
m_ShaderKeywords: _METALLIC_SETUP _SUNDISK_HIGH_QUALITY
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _BumpMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailAlbedoMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailMask:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailNormalMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _EmissionMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MainTex:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MetallicGlossMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _OcclusionMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _ParallaxMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _SpecGlossMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Floats:
- _AtmosphereThickness: 0.53
- _BumpScale: 1
- _Cutoff: 0.5
- _DetailNormalMapScale: 1
- _DstBlend: 0
- _Exposure: 1.25
- _GlossMapScale: 1
- _Glossiness: 0.5
- _GlossyReflections: 1
- _Metallic: 0
- _Mode: 0
- _OcclusionStrength: 1
- _Parallax: 0.02
- _SmoothnessTextureChannel: 0
- _SpecularHighlights: 1
- _SrcBlend: 1
- _SunDisk: 2
- _SunSize: 0.04
- _SunSizeConvergence: 5
- _UVSec: 0
- _WorkflowMode: 1
- _ZWrite: 1
m_Colors:
- _Color: {r: 1, g: 1, b: 1, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _GroundColor: {r: 0.6392157, g: 0.6901961, b: 0.7411765, a: 1}
- _SkyTint: {r: 1, g: 1, b: 1, a: 1}
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!21 &2100000
Material:
serializedVersion: 6
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_Name: Skybox_Mat
m_Shader: {fileID: 106, guid: 0000000000000000f000000000000000, type: 0}
m_ShaderKeywords: _METALLIC_SETUP _SUNDISK_HIGH_QUALITY
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _BumpMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailAlbedoMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailMask:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailNormalMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _EmissionMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MainTex:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MetallicGlossMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _OcclusionMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _ParallaxMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _SpecGlossMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Floats:
- _AtmosphereThickness: 0.53
- _BumpScale: 1
- _Cutoff: 0.5
- _DetailNormalMapScale: 1
- _DstBlend: 0
- _Exposure: 1.25
- _GlossMapScale: 1
- _Glossiness: 0.5
- _GlossyReflections: 1
- _Metallic: 0
- _Mode: 0
- _OcclusionStrength: 1
- _Parallax: 0.02
- _SmoothnessTextureChannel: 0
- _SpecularHighlights: 1
- _SrcBlend: 1
- _SunDisk: 2
- _SunSize: 0.04
- _SunSizeConvergence: 5
- _UVSec: 0
- _WorkflowMode: 1
- _ZWrite: 1
m_Colors:
- _Color: {r: 1, g: 1, b: 1, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _GroundColor: {r: 0.6392157, g: 0.6901961, b: 0.7411765, a: 1}
- _SkyTint: {r: 1, g: 1, b: 1, a: 1}
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}

View File

@ -1715,6 +1715,10 @@ GameObject:
m_Component:
- component: {fileID: 7072444061591351794}
- component: {fileID: 7072444061582351952}
- component: {fileID: 6381261399840543104}
- component: {fileID: 2971219656579870553}
- component: {fileID: 5912052353413311719}
- component: {fileID: 8293113947138725737}
m_Layer: 0
m_Name: PolyartCharacter
m_TagString: Untagged
@ -1762,6 +1766,104 @@ Animator:
m_HasTransformHierarchy: 1
m_AllowConstantClipSamplingOptimization: 1
m_KeepAnimatorControllerStateOnDisable: 0
--- !u!136 &6381261399840543104
CapsuleCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7072444061591711186}
m_Material: {fileID: 0}
m_IsTrigger: 0
m_Enabled: 1
m_Radius: 0.5
m_Height: 2.1
m_Direction: 1
m_Center: {x: 0, y: 1.06, z: 0}
--- !u!114 &2971219656579870553
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7072444061591711186}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 9826297ef4d853741b2af768441ec7f7, type: 3}
m_Name:
m_EditorClassIdentifier:
input_View: {x: 0, y: 0}
cameraHolder: {fileID: 7072444061591351696}
feetTransform: {fileID: 7072444061591351794}
playerSettings:
ViewXSensetivity: 0
ViewYSensetivity: 0
ViewXInverted: 0
ViewYInverted: 0
SprintingHold: 0
MovementSmoothing: 0
RunningForwardSpeed: 0
RunningStrafeSpeed: 0
WalkingForwardSpeed: 0
WalkingBackwardSpeed: 0
WalkingStrafeSpeed: 0
JumpingHeight: 0
JumpingFalloff: 0
FallingSmoothing: 0
SpeedEffector: 1
CrouchSpeedEffector: 0
ProneSpeedEffector: 0
FallingSpeedEffector: 0
ViewClampYMin: -70
ViewClampYMax: 80
playerMask:
serializedVersion: 2
m_Bits: 0
gravityAmount: 9.81
gravityMin: 0
jumpingForce: {x: 0, y: 30, z: 0}
playerStance: 0
playerStanceSmoothing: 0
playerStandStance:
CameraHeight: 0
StanceCollider: {fileID: 6381261399840543104}
playerCrouchStance:
CameraHeight: 0
StanceCollider: {fileID: 0}
playerProneStance:
CameraHeight: 0
StanceCollider: {fileID: 0}
currentWeapon: {fileID: 0}
--- !u!114 &5912052353413311719
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7072444061591711186}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 907ff02de47a55a4e971d73d25e7d006, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!143 &8293113947138725737
CharacterController:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7072444061591711186}
m_Material: {fileID: 0}
m_IsTrigger: 0
m_Enabled: 1
serializedVersion: 2
m_Height: 2.1
m_Radius: 0.5
m_SlopeLimit: 45
m_StepOffset: 0.3
m_SkinWidth: 0.08
m_MinMoveDistance: 0.001
m_Center: {x: 0, y: 1.02, z: 0}
--- !u!1 &7072444061591711188
GameObject:
m_ObjectHideFlags: 0

Some files were not shown because too many files have changed in this diff Show More