From 6b608dff1486d4c9c9b146cf4e1cfa5c66c569ca Mon Sep 17 00:00:00 2001 From: Leo Cardhio <leocardhio@gmail.com> Date: Fri, 14 Apr 2023 18:37:00 +0700 Subject: [PATCH] [feat] integrate quest and shop --- Assets/Audio/Effects/Pet Bird Death.wav.meta | 2 +- Assets/Audio/Effects/Pet Bird Hurt.wav.meta | 2 +- Assets/Audio/Effects/Pet Bird Spawn.mp3.meta | 2 +- .../Audio/Effects/Pet Cultist Hurt.wav.meta | 2 +- .../Effects/Pet Cultist Spawn Death.wav.meta | 2 +- .../Audio/Effects/Pet Rabbit Death.wav.meta | 2 +- Assets/Audio/Effects/Pet Rabbit Hurt.wav.meta | 2 +- .../Audio/Effects/Pet Rabbit Spawn.wav.meta | 2 +- Assets/Audio/Effects/Player Bow.wav.meta | 2 +- Assets/Audio/Effects/Player Slash.wav.meta | 2 +- .../Animation/Titan@Death.fbx.meta | 151 +++---- .../Animation/Titan@GetHit.fbx.meta | 153 +++----- .../Animation/Titan@Idle.fbx.meta | 153 +++----- .../Animation/Titan@Walk.fbx.meta | 369 +----------------- Assets/Creatures Titan/Mesh/Titan.fbx.meta | 152 +++----- .../Creatures Titan/Stand/Mesh/Stand.obj.meta | 62 ++- .../Texture/Titan__Albedo.tga.meta | 102 ++++- .../Texture/Titan__Ao.tga.meta | 102 ++++- .../Texture/Titan__Metallic.tga.meta | 102 ++++- .../Texture/Titan__normals.tga.meta | 106 ++++- Assets/Scripts/GameManager.cs | 12 + Assets/Scripts/Shop/ShopManager.cs | 12 +- Assets/Scripts/Shop/ShopTrigger.cs | 32 ++ Assets/Scripts/Shop/ShopTrigger.cs.meta | 11 + Assets/Textures/bow-arrow.png.meta | 18 +- 25 files changed, 650 insertions(+), 907 deletions(-) create mode 100644 Assets/Scripts/Shop/ShopTrigger.cs create mode 100644 Assets/Scripts/Shop/ShopTrigger.cs.meta diff --git a/Assets/Audio/Effects/Pet Bird Death.wav.meta b/Assets/Audio/Effects/Pet Bird Death.wav.meta index 18dffae5..f8727555 100644 --- a/Assets/Audio/Effects/Pet Bird Death.wav.meta +++ b/Assets/Audio/Effects/Pet Bird Death.wav.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 60cc90360f82f7449ba5c170e9e5b24a +guid: 8a8f0e3944844434ea6407b1f43ba0b8 AudioImporter: externalObjects: {} serializedVersion: 6 diff --git a/Assets/Audio/Effects/Pet Bird Hurt.wav.meta b/Assets/Audio/Effects/Pet Bird Hurt.wav.meta index 1ff03034..7b736ebf 100644 --- a/Assets/Audio/Effects/Pet Bird Hurt.wav.meta +++ b/Assets/Audio/Effects/Pet Bird Hurt.wav.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 029cdcf307c84e544abc3f3ef027536b +guid: 4031a79121f17e4499abc880da109433 AudioImporter: externalObjects: {} serializedVersion: 6 diff --git a/Assets/Audio/Effects/Pet Bird Spawn.mp3.meta b/Assets/Audio/Effects/Pet Bird Spawn.mp3.meta index 6506b2cd..5bf9b039 100644 --- a/Assets/Audio/Effects/Pet Bird Spawn.mp3.meta +++ b/Assets/Audio/Effects/Pet Bird Spawn.mp3.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 7cc82443bebe5eb4098ee825e607ee1a +guid: 0ee44057b9ac14b43a7213edf26545f2 AudioImporter: externalObjects: {} serializedVersion: 6 diff --git a/Assets/Audio/Effects/Pet Cultist Hurt.wav.meta b/Assets/Audio/Effects/Pet Cultist Hurt.wav.meta index 3b8c0b8a..f17ee344 100644 --- a/Assets/Audio/Effects/Pet Cultist Hurt.wav.meta +++ b/Assets/Audio/Effects/Pet Cultist Hurt.wav.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 09176acc9bf91d6439bc3245068619f3 +guid: adc8ea6b0358ae74e8a2251ba127b349 AudioImporter: externalObjects: {} serializedVersion: 6 diff --git a/Assets/Audio/Effects/Pet Cultist Spawn Death.wav.meta b/Assets/Audio/Effects/Pet Cultist Spawn Death.wav.meta index e10ccb56..3dcc88a2 100644 --- a/Assets/Audio/Effects/Pet Cultist Spawn Death.wav.meta +++ b/Assets/Audio/Effects/Pet Cultist Spawn Death.wav.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: a84dffcbace45f64993ed5f8ec4dba37 +guid: 9daac5a098522574880cca017f84edd7 AudioImporter: externalObjects: {} serializedVersion: 6 diff --git a/Assets/Audio/Effects/Pet Rabbit Death.wav.meta b/Assets/Audio/Effects/Pet Rabbit Death.wav.meta index 26428173..269f332c 100644 --- a/Assets/Audio/Effects/Pet Rabbit Death.wav.meta +++ b/Assets/Audio/Effects/Pet Rabbit Death.wav.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 6985f863f1e10a947bf0225e49345c76 +guid: fe1e48f5c7d234b44ba6fda1ba0c19d9 AudioImporter: externalObjects: {} serializedVersion: 6 diff --git a/Assets/Audio/Effects/Pet Rabbit Hurt.wav.meta b/Assets/Audio/Effects/Pet Rabbit Hurt.wav.meta index 20cdf5dc..5fc229f3 100644 --- a/Assets/Audio/Effects/Pet Rabbit Hurt.wav.meta +++ b/Assets/Audio/Effects/Pet Rabbit Hurt.wav.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: ebcff791de344034fbb8e7b398134da5 +guid: a18ec795cb3354543a3a4a80762f9f3c AudioImporter: externalObjects: {} serializedVersion: 6 diff --git a/Assets/Audio/Effects/Pet Rabbit Spawn.wav.meta b/Assets/Audio/Effects/Pet Rabbit Spawn.wav.meta index 6e77148f..25794bbb 100644 --- a/Assets/Audio/Effects/Pet Rabbit Spawn.wav.meta +++ b/Assets/Audio/Effects/Pet Rabbit Spawn.wav.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: a468574e748250643b5839fec12fe08d +guid: a8b050eed1db14341be082c9083d17cf AudioImporter: externalObjects: {} serializedVersion: 6 diff --git a/Assets/Audio/Effects/Player Bow.wav.meta b/Assets/Audio/Effects/Player Bow.wav.meta index adb8210e..5872e8c0 100644 --- a/Assets/Audio/Effects/Player Bow.wav.meta +++ b/Assets/Audio/Effects/Player Bow.wav.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 0a5dd97bd0604d44397959b4c9a0deb9 +guid: 5efabafd1a98d52418b5261b2816c3e9 AudioImporter: externalObjects: {} serializedVersion: 6 diff --git a/Assets/Audio/Effects/Player Slash.wav.meta b/Assets/Audio/Effects/Player Slash.wav.meta index 8519f255..4f860a34 100644 --- a/Assets/Audio/Effects/Player Slash.wav.meta +++ b/Assets/Audio/Effects/Player Slash.wav.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: ea3810a94c786994592b4af9547b4c46 +guid: 35cd00b1afb4f0b4780a4d5be44a81cd AudioImporter: externalObjects: {} serializedVersion: 6 diff --git a/Assets/Creatures Titan/Animation/Titan@Death.fbx.meta b/Assets/Creatures Titan/Animation/Titan@Death.fbx.meta index a04b3d4e..4f1ed3d1 100644 --- a/Assets/Creatures Titan/Animation/Titan@Death.fbx.meta +++ b/Assets/Creatures Titan/Animation/Titan@Death.fbx.meta @@ -1,154 +1,84 @@ fileFormatVersion: 2 -guid: 3446299ea8161824aa26187412d69ede -timeCreated: 1482915024 -licenseType: Store +guid: 11046fc6bf2733d4d8c55fbf61741f4b ModelImporter: - serializedVersion: 19 - fileIDToRecycleName: - 100000: Ankle_L - 100002: Ankle_R - 100004: Body - 100006: Chest_M - 100008: Elbow_L - 100010: Elbow_R - 100012: Eye_L - 100014: Eye_R - 100016: EyeEnd_L - 100018: EyeEnd_R - 100020: Head_M - 100022: HeadEnd_M - 100024: Hip_L - 100026: Hip_R - 100028: IndexFinger1_L - 100030: IndexFinger1_R - 100032: IndexFinger2_L - 100034: IndexFinger2_R - 100036: Jaw_M - 100038: Knee_L - 100040: Knee_R - 100042: MiddleFinger1_L - 100044: MiddleFinger1_R - 100046: MiddleFinger2_L - 100048: MiddleFinger2_R - 100050: Neck_M - 100052: Root_M - 100054: Scapula_L - 100056: Scapula_R - 100058: Shoulder_L - 100060: Shoulder_R - 100062: ShoulderPart1_L - 100064: ShoulderPart1_R - 100066: ShoulderPart2_L - 100068: ShoulderPart2_R - 100070: Spine1_M - 100072: ThumbFinger1_L - 100074: ThumbFinger1_R - 100076: ThumbFinger2_L - 100078: ThumbFinger2_R - 100080: //RootNode - 100082: Toes_L - 100084: Toes_R - 100086: ToesEnd_L - 100088: ToesEnd_R - 100090: Wrist_L - 100092: Wrist_R - 400000: Ankle_L - 400002: Ankle_R - 400004: Body - 400006: Chest_M - 400008: Elbow_L - 400010: Elbow_R - 400012: Eye_L - 400014: Eye_R - 400016: EyeEnd_L - 400018: EyeEnd_R - 400020: Head_M - 400022: HeadEnd_M - 400024: Hip_L - 400026: Hip_R - 400028: IndexFinger1_L - 400030: IndexFinger1_R - 400032: IndexFinger2_L - 400034: IndexFinger2_R - 400036: Jaw_M - 400038: Knee_L - 400040: Knee_R - 400042: MiddleFinger1_L - 400044: MiddleFinger1_R - 400046: MiddleFinger2_L - 400048: MiddleFinger2_R - 400050: Neck_M - 400052: Root_M - 400054: Scapula_L - 400056: Scapula_R - 400058: Shoulder_L - 400060: Shoulder_R - 400062: ShoulderPart1_L - 400064: ShoulderPart1_R - 400066: ShoulderPart2_L - 400068: ShoulderPart2_R - 400070: Spine1_M - 400072: ThumbFinger1_L - 400074: ThumbFinger1_R - 400076: ThumbFinger2_L - 400078: ThumbFinger2_R - 400080: //RootNode - 400082: Toes_L - 400084: Toes_R - 400086: ToesEnd_L - 400088: ToesEnd_R - 400090: Wrist_L - 400092: Wrist_R - 4300000: Body - 7400000: Take 001 - 9500000: //RootNode - 13700000: Body + serializedVersion: 21300 + internalIDToNameTable: [] + externalObjects: {} materials: - importMaterials: 1 + materialImportMode: 2 materialName: 0 materialSearch: 1 + materialLocation: 1 animations: legacyGenerateAnimations: 4 bakeSimulation: 0 resampleCurves: 1 optimizeGameObjects: 0 + removeConstantScaleCurves: 1 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: 1 + isReadable: 0 meshes: lODScreenPercentages: [] globalScale: 1 meshCompression: 0 addColliders: 0 + useSRGBMaterialColor: 1 + sortHierarchyByName: 1 + importVisibility: 1 importBlendShapes: 1 + importCameras: 1 + importLights: 1 + nodeNameCollisionStrategy: 1 + fileIdsGeneration: 2 swapUVChannels: 0 generateSecondaryUV: 0 useFileUnits: 1 - optimizeMeshForGPU: 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 tangentSpace: normalSmoothAngle: 60 normalImportMode: 0 tangentImportMode: 3 + normalCalculationMode: 4 + legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0 + blendShapeNormalImportMode: 1 + normalSmoothingSource: 0 + referencedClips: [] importAnimation: 1 - copyAvatar: 0 humanDescription: + serializedVersion: 3 human: [] skeleton: [] armTwist: 0.5 @@ -158,11 +88,18 @@ ModelImporter: 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 + remapMaterialsIfMaterialImportModeIsNone: 0 additionalBone: 0 userData: assetBundleName: diff --git a/Assets/Creatures Titan/Animation/Titan@GetHit.fbx.meta b/Assets/Creatures Titan/Animation/Titan@GetHit.fbx.meta index 22771df6..69d63d99 100644 --- a/Assets/Creatures Titan/Animation/Titan@GetHit.fbx.meta +++ b/Assets/Creatures Titan/Animation/Titan@GetHit.fbx.meta @@ -1,156 +1,84 @@ fileFormatVersion: 2 -guid: a8b3cfb4d36cd22418c848a0431ee9dd -timeCreated: 1482915029 -licenseType: Store +guid: 8ba7ad0ad85ff4b45831baaab1ed9b51 ModelImporter: - serializedVersion: 19 - fileIDToRecycleName: - 100000: Ankle_L - 100002: Ankle_R - 100004: Body - 100006: Chest_M - 100008: Elbow_L - 100010: Elbow_R - 100012: Eye_L - 100014: Eye_R - 100016: EyeEnd_L - 100018: EyeEnd_R - 100020: Head_M - 100022: HeadEnd_M - 100024: Hip_L - 100026: Hip_R - 100028: IndexFinger1_L - 100030: IndexFinger1_R - 100032: IndexFinger2_L - 100034: IndexFinger2_R - 100036: Jaw_M - 100038: Knee_L - 100040: Knee_R - 100042: left - 100044: MiddleFinger1_L - 100046: MiddleFinger1_R - 100048: MiddleFinger2_L - 100050: MiddleFinger2_R - 100052: Neck_M - 100054: Root_M - 100056: Scapula_L - 100058: Scapula_R - 100060: Shoulder_L - 100062: Shoulder_R - 100064: ShoulderPart1_L - 100066: ShoulderPart1_R - 100068: ShoulderPart2_L - 100070: ShoulderPart2_R - 100072: Spine1_M - 100074: ThumbFinger1_L - 100076: ThumbFinger1_R - 100078: ThumbFinger2_L - 100080: ThumbFinger2_R - 100082: //RootNode - 100084: Toes_L - 100086: Toes_R - 100088: ToesEnd_L - 100090: ToesEnd_R - 100092: Wrist_L - 100094: Wrist_R - 400000: Ankle_L - 400002: Ankle_R - 400004: Body - 400006: Chest_M - 400008: Elbow_L - 400010: Elbow_R - 400012: Eye_L - 400014: Eye_R - 400016: EyeEnd_L - 400018: EyeEnd_R - 400020: Head_M - 400022: HeadEnd_M - 400024: Hip_L - 400026: Hip_R - 400028: IndexFinger1_L - 400030: IndexFinger1_R - 400032: IndexFinger2_L - 400034: IndexFinger2_R - 400036: Jaw_M - 400038: Knee_L - 400040: Knee_R - 400042: left - 400044: MiddleFinger1_L - 400046: MiddleFinger1_R - 400048: MiddleFinger2_L - 400050: MiddleFinger2_R - 400052: Neck_M - 400054: Root_M - 400056: Scapula_L - 400058: Scapula_R - 400060: Shoulder_L - 400062: Shoulder_R - 400064: ShoulderPart1_L - 400066: ShoulderPart1_R - 400068: ShoulderPart2_L - 400070: ShoulderPart2_R - 400072: Spine1_M - 400074: ThumbFinger1_L - 400076: ThumbFinger1_R - 400078: ThumbFinger2_L - 400080: ThumbFinger2_R - 400082: //RootNode - 400084: Toes_L - 400086: Toes_R - 400088: ToesEnd_L - 400090: ToesEnd_R - 400092: Wrist_L - 400094: Wrist_R - 4300000: Body - 7400000: Take 001 - 9500000: //RootNode - 13700000: Body + serializedVersion: 21300 + internalIDToNameTable: [] + externalObjects: {} materials: - importMaterials: 1 + materialImportMode: 2 materialName: 0 materialSearch: 1 + materialLocation: 1 animations: legacyGenerateAnimations: 4 bakeSimulation: 0 resampleCurves: 1 optimizeGameObjects: 0 + removeConstantScaleCurves: 1 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: 1 + isReadable: 0 meshes: lODScreenPercentages: [] globalScale: 1 meshCompression: 0 addColliders: 0 + useSRGBMaterialColor: 1 + sortHierarchyByName: 1 + importVisibility: 1 importBlendShapes: 1 + importCameras: 1 + importLights: 1 + nodeNameCollisionStrategy: 1 + fileIdsGeneration: 2 swapUVChannels: 0 generateSecondaryUV: 0 useFileUnits: 1 - optimizeMeshForGPU: 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 tangentSpace: normalSmoothAngle: 60 normalImportMode: 0 tangentImportMode: 3 + normalCalculationMode: 4 + legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0 + blendShapeNormalImportMode: 1 + normalSmoothingSource: 0 + referencedClips: [] importAnimation: 1 - copyAvatar: 0 humanDescription: + serializedVersion: 3 human: [] skeleton: [] armTwist: 0.5 @@ -160,11 +88,18 @@ ModelImporter: 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 + remapMaterialsIfMaterialImportModeIsNone: 0 additionalBone: 0 userData: assetBundleName: diff --git a/Assets/Creatures Titan/Animation/Titan@Idle.fbx.meta b/Assets/Creatures Titan/Animation/Titan@Idle.fbx.meta index 0c8a8642..24e842bc 100644 --- a/Assets/Creatures Titan/Animation/Titan@Idle.fbx.meta +++ b/Assets/Creatures Titan/Animation/Titan@Idle.fbx.meta @@ -1,156 +1,84 @@ fileFormatVersion: 2 -guid: 3e99ec06c5efc9d4089299d760d40f7c -timeCreated: 1482915027 -licenseType: Store +guid: 30709076baec42d46b1984bc4267f733 ModelImporter: - serializedVersion: 19 - fileIDToRecycleName: - 100000: Ankle_L - 100002: Ankle_R - 100004: Body - 100006: Chest_M - 100008: Elbow_L - 100010: Elbow_R - 100012: Eye_L - 100014: Eye_R - 100016: EyeEnd_L - 100018: EyeEnd_R - 100020: Head_M - 100022: HeadEnd_M - 100024: Hip_L - 100026: Hip_R - 100028: IndexFinger1_L - 100030: IndexFinger1_R - 100032: IndexFinger2_L - 100034: IndexFinger2_R - 100036: Jaw_M - 100038: Knee_L - 100040: Knee_R - 100042: left - 100044: MiddleFinger1_L - 100046: MiddleFinger1_R - 100048: MiddleFinger2_L - 100050: MiddleFinger2_R - 100052: Neck_M - 100054: Root_M - 100056: Scapula_L - 100058: Scapula_R - 100060: Shoulder_L - 100062: Shoulder_R - 100064: ShoulderPart1_L - 100066: ShoulderPart1_R - 100068: ShoulderPart2_L - 100070: ShoulderPart2_R - 100072: Spine1_M - 100074: ThumbFinger1_L - 100076: ThumbFinger1_R - 100078: ThumbFinger2_L - 100080: ThumbFinger2_R - 100082: //RootNode - 100084: Toes_L - 100086: Toes_R - 100088: ToesEnd_L - 100090: ToesEnd_R - 100092: Wrist_L - 100094: Wrist_R - 400000: Ankle_L - 400002: Ankle_R - 400004: Body - 400006: Chest_M - 400008: Elbow_L - 400010: Elbow_R - 400012: Eye_L - 400014: Eye_R - 400016: EyeEnd_L - 400018: EyeEnd_R - 400020: Head_M - 400022: HeadEnd_M - 400024: Hip_L - 400026: Hip_R - 400028: IndexFinger1_L - 400030: IndexFinger1_R - 400032: IndexFinger2_L - 400034: IndexFinger2_R - 400036: Jaw_M - 400038: Knee_L - 400040: Knee_R - 400042: left - 400044: MiddleFinger1_L - 400046: MiddleFinger1_R - 400048: MiddleFinger2_L - 400050: MiddleFinger2_R - 400052: Neck_M - 400054: Root_M - 400056: Scapula_L - 400058: Scapula_R - 400060: Shoulder_L - 400062: Shoulder_R - 400064: ShoulderPart1_L - 400066: ShoulderPart1_R - 400068: ShoulderPart2_L - 400070: ShoulderPart2_R - 400072: Spine1_M - 400074: ThumbFinger1_L - 400076: ThumbFinger1_R - 400078: ThumbFinger2_L - 400080: ThumbFinger2_R - 400082: //RootNode - 400084: Toes_L - 400086: Toes_R - 400088: ToesEnd_L - 400090: ToesEnd_R - 400092: Wrist_L - 400094: Wrist_R - 4300000: Body - 7400000: Take 001 - 9500000: //RootNode - 13700000: Body + serializedVersion: 21300 + internalIDToNameTable: [] + externalObjects: {} materials: - importMaterials: 1 + materialImportMode: 2 materialName: 0 materialSearch: 1 + materialLocation: 1 animations: legacyGenerateAnimations: 4 bakeSimulation: 0 resampleCurves: 1 optimizeGameObjects: 0 + removeConstantScaleCurves: 1 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: 1 + isReadable: 0 meshes: lODScreenPercentages: [] globalScale: 1 meshCompression: 0 addColliders: 0 + useSRGBMaterialColor: 1 + sortHierarchyByName: 1 + importVisibility: 1 importBlendShapes: 1 + importCameras: 1 + importLights: 1 + nodeNameCollisionStrategy: 1 + fileIdsGeneration: 2 swapUVChannels: 0 generateSecondaryUV: 0 useFileUnits: 1 - optimizeMeshForGPU: 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 tangentSpace: normalSmoothAngle: 60 normalImportMode: 0 tangentImportMode: 3 + normalCalculationMode: 4 + legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0 + blendShapeNormalImportMode: 1 + normalSmoothingSource: 0 + referencedClips: [] importAnimation: 1 - copyAvatar: 0 humanDescription: + serializedVersion: 3 human: [] skeleton: [] armTwist: 0.5 @@ -160,11 +88,18 @@ ModelImporter: 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 + remapMaterialsIfMaterialImportModeIsNone: 0 additionalBone: 0 userData: assetBundleName: diff --git a/Assets/Creatures Titan/Animation/Titan@Walk.fbx.meta b/Assets/Creatures Titan/Animation/Titan@Walk.fbx.meta index 55d462a8..6ff34014 100644 --- a/Assets/Creatures Titan/Animation/Titan@Walk.fbx.meta +++ b/Assets/Creatures Titan/Animation/Titan@Walk.fbx.meta @@ -1,320 +1,20 @@ fileFormatVersion: 2 -guid: af57220899fe7f942bcb29e993d89983 +guid: 3a5de04eed4571b4fb81bdd4488666ce ModelImporter: serializedVersion: 21300 - internalIDToNameTable: - - first: - 1: 100000 - second: Ankle_L - - first: - 1: 100002 - second: Ankle_R - - first: - 1: 100004 - second: Body - - first: - 1: 100006 - second: Chest_M - - first: - 1: 100008 - second: Elbow_L - - first: - 1: 100010 - second: Elbow_R - - first: - 1: 100012 - second: Eye_L - - first: - 1: 100014 - second: Eye_R - - first: - 1: 100016 - second: EyeEnd_L - - first: - 1: 100018 - second: EyeEnd_R - - first: - 1: 100020 - second: Head_M - - first: - 1: 100022 - second: HeadEnd_M - - first: - 1: 100024 - second: Hip_L - - first: - 1: 100026 - second: Hip_R - - first: - 1: 100028 - second: IndexFinger1_L - - first: - 1: 100030 - second: IndexFinger1_R - - first: - 1: 100032 - second: IndexFinger2_L - - first: - 1: 100034 - second: IndexFinger2_R - - first: - 1: 100036 - second: Jaw_M - - first: - 1: 100038 - second: Knee_L - - first: - 1: 100040 - second: Knee_R - - first: - 1: 100042 - second: left - - first: - 1: 100044 - second: MiddleFinger1_L - - first: - 1: 100046 - second: MiddleFinger1_R - - first: - 1: 100048 - second: MiddleFinger2_L - - first: - 1: 100050 - second: MiddleFinger2_R - - first: - 1: 100052 - second: Neck_M - - first: - 1: 100054 - second: Root_M - - first: - 1: 100056 - second: Scapula_L - - first: - 1: 100058 - second: Scapula_R - - first: - 1: 100060 - second: Shoulder_L - - first: - 1: 100062 - second: Shoulder_R - - first: - 1: 100064 - second: ShoulderPart1_L - - first: - 1: 100066 - second: ShoulderPart1_R - - first: - 1: 100068 - second: ShoulderPart2_L - - first: - 1: 100070 - second: ShoulderPart2_R - - first: - 1: 100072 - second: Spine1_M - - first: - 1: 100074 - second: ThumbFinger1_L - - first: - 1: 100076 - second: ThumbFinger1_R - - first: - 1: 100078 - second: ThumbFinger2_L - - first: - 1: 100080 - second: ThumbFinger2_R - - first: - 1: 100082 - second: //RootNode - - first: - 1: 100084 - second: Toes_L - - first: - 1: 100086 - second: Toes_R - - first: - 1: 100088 - second: ToesEnd_L - - first: - 1: 100090 - second: ToesEnd_R - - first: - 1: 100092 - second: Wrist_L - - first: - 1: 100094 - second: Wrist_R - - first: - 4: 400000 - second: Ankle_L - - first: - 4: 400002 - second: Ankle_R - - first: - 4: 400004 - second: Body - - first: - 4: 400006 - second: Chest_M - - first: - 4: 400008 - second: Elbow_L - - first: - 4: 400010 - second: Elbow_R - - first: - 4: 400012 - second: Eye_L - - first: - 4: 400014 - second: Eye_R - - first: - 4: 400016 - second: EyeEnd_L - - first: - 4: 400018 - second: EyeEnd_R - - first: - 4: 400020 - second: Head_M - - first: - 4: 400022 - second: HeadEnd_M - - first: - 4: 400024 - second: Hip_L - - first: - 4: 400026 - second: Hip_R - - first: - 4: 400028 - second: IndexFinger1_L - - first: - 4: 400030 - second: IndexFinger1_R - - first: - 4: 400032 - second: IndexFinger2_L - - first: - 4: 400034 - second: IndexFinger2_R - - first: - 4: 400036 - second: Jaw_M - - first: - 4: 400038 - second: Knee_L - - first: - 4: 400040 - second: Knee_R - - first: - 4: 400042 - second: left - - first: - 4: 400044 - second: MiddleFinger1_L - - first: - 4: 400046 - second: MiddleFinger1_R - - first: - 4: 400048 - second: MiddleFinger2_L - - first: - 4: 400050 - second: MiddleFinger2_R - - first: - 4: 400052 - second: Neck_M - - first: - 4: 400054 - second: Root_M - - first: - 4: 400056 - second: Scapula_L - - first: - 4: 400058 - second: Scapula_R - - first: - 4: 400060 - second: Shoulder_L - - first: - 4: 400062 - second: Shoulder_R - - first: - 4: 400064 - second: ShoulderPart1_L - - first: - 4: 400066 - second: ShoulderPart1_R - - first: - 4: 400068 - second: ShoulderPart2_L - - first: - 4: 400070 - second: ShoulderPart2_R - - first: - 4: 400072 - second: Spine1_M - - first: - 4: 400074 - second: ThumbFinger1_L - - first: - 4: 400076 - second: ThumbFinger1_R - - first: - 4: 400078 - second: ThumbFinger2_L - - first: - 4: 400080 - second: ThumbFinger2_R - - first: - 4: 400082 - second: //RootNode - - first: - 4: 400084 - second: Toes_L - - first: - 4: 400086 - second: Toes_R - - first: - 4: 400088 - second: ToesEnd_L - - first: - 4: 400090 - second: ToesEnd_R - - first: - 4: 400092 - second: Wrist_L - - first: - 4: 400094 - second: Wrist_R - - first: - 43: 4300000 - second: Body - - first: - 74: 7400000 - second: Walk - - first: - 95: 9500000 - second: //RootNode - - first: - 137: 13700000 - second: Body + internalIDToNameTable: [] externalObjects: {} materials: - materialImportMode: 1 + materialImportMode: 2 materialName: 0 materialSearch: 1 - materialLocation: 0 + materialLocation: 1 animations: legacyGenerateAnimations: 4 bakeSimulation: 0 resampleCurves: 1 optimizeGameObjects: 0 - removeConstantScaleCurves: 0 + removeConstantScaleCurves: 1 motionNodeName: rigImportErrors: rigImportWarnings: @@ -331,37 +31,8 @@ ModelImporter: animationWrapMode: 0 extraExposedTransformPaths: [] extraUserProperties: [] - clipAnimations: - - serializedVersion: 16 - name: Walk - takeName: Take 001 - internalID: 7400000 - firstFrame: 0 - lastFrame: 43 - wrapMode: 0 - orientationOffsetY: 0 - level: 0 - cycleOffset: 0 - loop: 0 - hasAdditiveReferencePose: 0 - loopTime: 1 - loopBlend: 1 - 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: 0 - isReadable: 1 + clipAnimations: [] + isReadable: 0 meshes: lODScreenPercentages: [] globalScale: 1 @@ -369,12 +40,12 @@ ModelImporter: addColliders: 0 useSRGBMaterialColor: 1 sortHierarchyByName: 1 - importVisibility: 0 + importVisibility: 1 importBlendShapes: 1 - importCameras: 0 - importLights: 0 - nodeNameCollisionStrategy: 0 - fileIdsGeneration: 1 + importCameras: 1 + importLights: 1 + nodeNameCollisionStrategy: 1 + fileIdsGeneration: 2 swapUVChannels: 0 generateSecondaryUV: 0 useFileUnits: 1 @@ -387,11 +58,11 @@ ModelImporter: minBoneWeight: 0.001 optimizeBones: 1 meshOptimizationFlags: -1 - indexFormat: 1 + indexFormat: 0 secondaryUVAngleDistortion: 8 secondaryUVAreaDistortion: 15.000001 secondaryUVHardAngle: 88 - secondaryUVMarginMethod: 0 + secondaryUVMarginMethod: 1 secondaryUVMinLightmapResolution: 40 secondaryUVMinObjectScale: 1 secondaryUVPackMargin: 4 @@ -400,8 +71,8 @@ ModelImporter: normalSmoothAngle: 60 normalImportMode: 0 tangentImportMode: 3 - normalCalculationMode: 0 - legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 1 + normalCalculationMode: 4 + legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0 blendShapeNormalImportMode: 1 normalSmoothingSource: 0 referencedClips: [] @@ -421,14 +92,14 @@ ModelImporter: rootMotionBoneName: hasTranslationDoF: 0 hasExtraRoot: 0 - skeletonHasParents: 0 + skeletonHasParents: 1 lastHumanDescriptionAvatarSource: {instanceID: 0} autoGenerateAvatarMappingIfUnspecified: 1 animationType: 2 humanoidOversampling: 1 - avatarSetup: 1 - addHumanoidExtraRootOnlyWhenUsingAvatar: 0 - remapMaterialsIfMaterialImportModeIsNone: 1 + avatarSetup: 0 + addHumanoidExtraRootOnlyWhenUsingAvatar: 1 + remapMaterialsIfMaterialImportModeIsNone: 0 additionalBone: 0 userData: assetBundleName: diff --git a/Assets/Creatures Titan/Mesh/Titan.fbx.meta b/Assets/Creatures Titan/Mesh/Titan.fbx.meta index 99da3549..7f78d3d9 100644 --- a/Assets/Creatures Titan/Mesh/Titan.fbx.meta +++ b/Assets/Creatures Titan/Mesh/Titan.fbx.meta @@ -1,155 +1,84 @@ fileFormatVersion: 2 -guid: 24c4300f68c986241af51004b72b03f2 -timeCreated: 1482915035 -licenseType: Store +guid: d7c8cdb8307a714418115e26c292596b ModelImporter: - serializedVersion: 19 - fileIDToRecycleName: - 100000: Ankle_L - 100002: Ankle_R - 100004: Body - 100006: Chest_M - 100008: Elbow_L - 100010: Elbow_R - 100012: Eye_L - 100014: Eye_R - 100016: EyeEnd_L - 100018: EyeEnd_R - 100020: Head_M - 100022: HeadEnd_M - 100024: Hip_L - 100026: Hip_R - 100028: IndexFinger1_L - 100030: IndexFinger1_R - 100032: IndexFinger2_L - 100034: IndexFinger2_R - 100036: Jaw_M - 100038: Knee_L - 100040: Knee_R - 100042: left - 100044: MiddleFinger1_L - 100046: MiddleFinger1_R - 100048: MiddleFinger2_L - 100050: MiddleFinger2_R - 100052: Neck_M - 100054: Root_M - 100056: Scapula_L - 100058: Scapula_R - 100060: Shoulder_L - 100062: Shoulder_R - 100064: ShoulderPart1_L - 100066: ShoulderPart1_R - 100068: ShoulderPart2_L - 100070: ShoulderPart2_R - 100072: Spine1_M - 100074: ThumbFinger1_L - 100076: ThumbFinger1_R - 100078: ThumbFinger2_L - 100080: ThumbFinger2_R - 100082: //RootNode - 100084: Toes_L - 100086: Toes_R - 100088: ToesEnd_L - 100090: ToesEnd_R - 100092: Wrist_L - 100094: Wrist_R - 400000: Ankle_L - 400002: Ankle_R - 400004: Body - 400006: Chest_M - 400008: Elbow_L - 400010: Elbow_R - 400012: Eye_L - 400014: Eye_R - 400016: EyeEnd_L - 400018: EyeEnd_R - 400020: Head_M - 400022: HeadEnd_M - 400024: Hip_L - 400026: Hip_R - 400028: IndexFinger1_L - 400030: IndexFinger1_R - 400032: IndexFinger2_L - 400034: IndexFinger2_R - 400036: Jaw_M - 400038: Knee_L - 400040: Knee_R - 400042: left - 400044: MiddleFinger1_L - 400046: MiddleFinger1_R - 400048: MiddleFinger2_L - 400050: MiddleFinger2_R - 400052: Neck_M - 400054: Root_M - 400056: Scapula_L - 400058: Scapula_R - 400060: Shoulder_L - 400062: Shoulder_R - 400064: ShoulderPart1_L - 400066: ShoulderPart1_R - 400068: ShoulderPart2_L - 400070: ShoulderPart2_R - 400072: Spine1_M - 400074: ThumbFinger1_L - 400076: ThumbFinger1_R - 400078: ThumbFinger2_L - 400080: ThumbFinger2_R - 400082: //RootNode - 400084: Toes_L - 400086: Toes_R - 400088: ToesEnd_L - 400090: ToesEnd_R - 400092: Wrist_L - 400094: Wrist_R - 4300000: Body - 9500000: //RootNode - 13700000: Body + serializedVersion: 21300 + internalIDToNameTable: [] + externalObjects: {} materials: - importMaterials: 1 + materialImportMode: 2 materialName: 0 materialSearch: 1 + materialLocation: 1 animations: legacyGenerateAnimations: 4 bakeSimulation: 0 resampleCurves: 1 optimizeGameObjects: 0 + removeConstantScaleCurves: 1 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: 1 + isReadable: 0 meshes: lODScreenPercentages: [] globalScale: 1 meshCompression: 0 addColliders: 0 + useSRGBMaterialColor: 1 + sortHierarchyByName: 1 + importVisibility: 1 importBlendShapes: 1 + importCameras: 1 + importLights: 1 + nodeNameCollisionStrategy: 1 + fileIdsGeneration: 2 swapUVChannels: 0 generateSecondaryUV: 0 useFileUnits: 1 - optimizeMeshForGPU: 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 tangentSpace: normalSmoothAngle: 60 normalImportMode: 0 tangentImportMode: 3 + normalCalculationMode: 4 + legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0 + blendShapeNormalImportMode: 1 + normalSmoothingSource: 0 + referencedClips: [] importAnimation: 1 - copyAvatar: 0 humanDescription: + serializedVersion: 3 human: [] skeleton: [] armTwist: 0.5 @@ -159,11 +88,18 @@ ModelImporter: 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 + remapMaterialsIfMaterialImportModeIsNone: 0 additionalBone: 0 userData: assetBundleName: diff --git a/Assets/Creatures Titan/Stand/Mesh/Stand.obj.meta b/Assets/Creatures Titan/Stand/Mesh/Stand.obj.meta index 93e5e5bd..4f25d242 100644 --- a/Assets/Creatures Titan/Stand/Mesh/Stand.obj.meta +++ b/Assets/Creatures Titan/Stand/Mesh/Stand.obj.meta @@ -1,63 +1,84 @@ fileFormatVersion: 2 -guid: 41aa2a342415afc47b835fe30f10d5de -timeCreated: 1482915036 -licenseType: Store +guid: 20eda2ee143769049a583ff1726e95cf ModelImporter: - serializedVersion: 19 - fileIDToRecycleName: - 100000: Cylinder001 - 100002: //RootNode - 400000: Cylinder001 - 400002: //RootNode - 2300000: Cylinder001 - 3300000: Cylinder001 - 4300000: Cylinder001 + serializedVersion: 21300 + internalIDToNameTable: [] + externalObjects: {} materials: - importMaterials: 1 + materialImportMode: 2 materialName: 0 materialSearch: 1 + materialLocation: 1 animations: legacyGenerateAnimations: 4 bakeSimulation: 0 resampleCurves: 1 optimizeGameObjects: 0 + removeConstantScaleCurves: 1 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: 1 + isReadable: 0 meshes: lODScreenPercentages: [] globalScale: 1 meshCompression: 0 addColliders: 0 + useSRGBMaterialColor: 1 + sortHierarchyByName: 1 + importVisibility: 1 importBlendShapes: 1 + importCameras: 1 + importLights: 1 + nodeNameCollisionStrategy: 1 + fileIdsGeneration: 2 swapUVChannels: 0 generateSecondaryUV: 0 useFileUnits: 1 - optimizeMeshForGPU: 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 tangentSpace: normalSmoothAngle: 60 normalImportMode: 0 tangentImportMode: 3 + normalCalculationMode: 4 + legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0 + blendShapeNormalImportMode: 1 + normalSmoothingSource: 0 + referencedClips: [] importAnimation: 1 - copyAvatar: 0 humanDescription: + serializedVersion: 3 human: [] skeleton: [] armTwist: 0.5 @@ -67,11 +88,18 @@ ModelImporter: armStretch: 0.05 legStretch: 0.05 feetSpacing: 0 + globalScale: 1 rootMotionBoneName: hasTranslationDoF: 0 + hasExtraRoot: 0 + skeletonHasParents: 1 lastHumanDescriptionAvatarSource: {instanceID: 0} - animationType: 0 + autoGenerateAvatarMappingIfUnspecified: 1 + animationType: 2 humanoidOversampling: 1 + avatarSetup: 0 + addHumanoidExtraRootOnlyWhenUsingAvatar: 1 + remapMaterialsIfMaterialImportModeIsNone: 0 additionalBone: 0 userData: assetBundleName: diff --git a/Assets/Creatures Titan/Texture/Titan__Albedo.tga.meta b/Assets/Creatures Titan/Texture/Titan__Albedo.tga.meta index e8edb698..35145b66 100644 --- a/Assets/Creatures Titan/Texture/Titan__Albedo.tga.meta +++ b/Assets/Creatures Titan/Texture/Titan__Albedo.tga.meta @@ -1,17 +1,18 @@ fileFormatVersion: 2 -guid: 65226824c0943324db930ef4b908c9b4 -timeCreated: 1482914995 -licenseType: Store +guid: c8604d22d2d0eef4291639ccbb7e7203 TextureImporter: - fileIDToRecycleName: {} - serializedVersion: 2 + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 mipmaps: mipMapMode: 0 enableMipMap: 1 + sRGBTexture: 1 linearTexture: 0 - correctGamma: 0 fadeOut: 0 borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 mipMapFadeDistanceStart: 1 mipMapFadeDistanceEnd: 3 bumpmap: @@ -20,40 +21,103 @@ TextureImporter: heightScale: 0.25 normalMapFilter: 0 isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMasterTextureLimit: 0 grayScaleToAlpha: 0 - generateCubemap: 0 + generateCubemap: 6 cubemapConvolution: 0 - cubemapConvolutionSteps: 7 - cubemapConvolutionExponent: 1.5 seamlessCubemap: 0 - textureFormat: -1 + textureFormat: 1 maxTextureSize: 2048 textureSettings: - filterMode: -1 - aniso: -1 - mipBias: -1 - wrapMode: -1 + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 nPOTScale: 1 lightmap: 0 - rGBM: 0 compressionQuality: 50 - allowsAlphaSplitting: 0 spriteMode: 0 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spriteBorder: {x: 0, y: 0, z: 0, w: 0} spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 alphaIsTransparency: 0 spriteTessellationDetail: -1 - textureType: -1 - buildTargetSettings: [] + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: [] outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Creatures Titan/Texture/Titan__Ao.tga.meta b/Assets/Creatures Titan/Texture/Titan__Ao.tga.meta index c215041f..b085d493 100644 --- a/Assets/Creatures Titan/Texture/Titan__Ao.tga.meta +++ b/Assets/Creatures Titan/Texture/Titan__Ao.tga.meta @@ -1,17 +1,18 @@ fileFormatVersion: 2 -guid: ee4cbbe4851fb65488d9c46ee3bad6ad -timeCreated: 1482915015 -licenseType: Store +guid: 89e27bf124be53e4d93089cc0316b402 TextureImporter: - fileIDToRecycleName: {} - serializedVersion: 2 + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 mipmaps: mipMapMode: 0 enableMipMap: 1 + sRGBTexture: 1 linearTexture: 0 - correctGamma: 0 fadeOut: 0 borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 mipMapFadeDistanceStart: 1 mipMapFadeDistanceEnd: 3 bumpmap: @@ -20,40 +21,103 @@ TextureImporter: heightScale: 0.25 normalMapFilter: 0 isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMasterTextureLimit: 0 grayScaleToAlpha: 0 - generateCubemap: 0 + generateCubemap: 6 cubemapConvolution: 0 - cubemapConvolutionSteps: 7 - cubemapConvolutionExponent: 1.5 seamlessCubemap: 0 - textureFormat: -1 + textureFormat: 1 maxTextureSize: 2048 textureSettings: - filterMode: -1 - aniso: -1 - mipBias: -1 - wrapMode: -1 + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 nPOTScale: 1 lightmap: 0 - rGBM: 0 compressionQuality: 50 - allowsAlphaSplitting: 0 spriteMode: 0 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spriteBorder: {x: 0, y: 0, z: 0, w: 0} spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 alphaIsTransparency: 0 spriteTessellationDetail: -1 - textureType: -1 - buildTargetSettings: [] + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: [] outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Creatures Titan/Texture/Titan__Metallic.tga.meta b/Assets/Creatures Titan/Texture/Titan__Metallic.tga.meta index 0d37fedb..15534710 100644 --- a/Assets/Creatures Titan/Texture/Titan__Metallic.tga.meta +++ b/Assets/Creatures Titan/Texture/Titan__Metallic.tga.meta @@ -1,17 +1,18 @@ fileFormatVersion: 2 -guid: 3cc3e2c2a3cb9604caa7c563c9b90877 -timeCreated: 1482914983 -licenseType: Store +guid: eb9bfd2599c83024bac0cac93f88a72c TextureImporter: - fileIDToRecycleName: {} - serializedVersion: 2 + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 mipmaps: mipMapMode: 0 enableMipMap: 1 + sRGBTexture: 1 linearTexture: 0 - correctGamma: 0 fadeOut: 0 borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 mipMapFadeDistanceStart: 1 mipMapFadeDistanceEnd: 3 bumpmap: @@ -20,40 +21,103 @@ TextureImporter: heightScale: 0.25 normalMapFilter: 0 isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMasterTextureLimit: 0 grayScaleToAlpha: 0 - generateCubemap: 0 + generateCubemap: 6 cubemapConvolution: 0 - cubemapConvolutionSteps: 7 - cubemapConvolutionExponent: 1.5 seamlessCubemap: 0 - textureFormat: -1 + textureFormat: 1 maxTextureSize: 2048 textureSettings: - filterMode: -1 - aniso: -1 - mipBias: -1 - wrapMode: -1 + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 nPOTScale: 1 lightmap: 0 - rGBM: 0 compressionQuality: 50 - allowsAlphaSplitting: 0 spriteMode: 0 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spriteBorder: {x: 0, y: 0, z: 0, w: 0} spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 alphaIsTransparency: 0 spriteTessellationDetail: -1 - textureType: -1 - buildTargetSettings: [] + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: [] outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Creatures Titan/Texture/Titan__normals.tga.meta b/Assets/Creatures Titan/Texture/Titan__normals.tga.meta index cee732af..cf5bf894 100644 --- a/Assets/Creatures Titan/Texture/Titan__normals.tga.meta +++ b/Assets/Creatures Titan/Texture/Titan__normals.tga.meta @@ -1,59 +1,123 @@ fileFormatVersion: 2 -guid: 83ad6b9b9e4e7c04dab853ce9eeaf873 -timeCreated: 1482915007 -licenseType: Store +guid: 21fca420d99ed9e45a3aa79b4b5be941 TextureImporter: - fileIDToRecycleName: {} - serializedVersion: 2 + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 mipmaps: mipMapMode: 0 enableMipMap: 1 - linearTexture: 1 - correctGamma: 0 + sRGBTexture: 1 + linearTexture: 0 fadeOut: 0 borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 mipMapFadeDistanceStart: 1 mipMapFadeDistanceEnd: 3 bumpmap: convertToNormalMap: 0 - externalNormalMap: 1 + externalNormalMap: 0 heightScale: 0.25 normalMapFilter: 0 isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMasterTextureLimit: 0 grayScaleToAlpha: 0 - generateCubemap: 0 + generateCubemap: 6 cubemapConvolution: 0 - cubemapConvolutionSteps: 7 - cubemapConvolutionExponent: 1.5 seamlessCubemap: 0 - textureFormat: -1 + textureFormat: 1 maxTextureSize: 2048 textureSettings: - filterMode: -1 - aniso: -1 - mipBias: -1 - wrapMode: -1 + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 nPOTScale: 1 lightmap: 0 - rGBM: 0 compressionQuality: 50 - allowsAlphaSplitting: 0 spriteMode: 0 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spriteBorder: {x: 0, y: 0, z: 0, w: 0} spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 alphaIsTransparency: 0 spriteTessellationDetail: -1 - textureType: 1 - buildTargetSettings: [] + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: [] outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Scripts/GameManager.cs b/Assets/Scripts/GameManager.cs index a058a475..69ac9ecf 100644 --- a/Assets/Scripts/GameManager.cs +++ b/Assets/Scripts/GameManager.cs @@ -16,6 +16,7 @@ public class GameManager : MonoBehaviour public bool isPetAlive = false; public bool isShopOpen = true; // shop only open after finishing quest public bool isShopping = false; // sedang berbelanja + public bool isEnemySpawning = true; public PetFactory petFactory; // Weapon @@ -26,10 +27,15 @@ public class GameManager : MonoBehaviour [Header("HUD")] public HUDManager hudManager; + // Enemy + [Header("Enemy")] + public GameObject enemyManager; + public static GameManager gameManager; private void Awake() { + enemyManager.SetActive(isEnemySpawning); if (gameManager == null) { gameManager = this; @@ -56,6 +62,7 @@ public class GameManager : MonoBehaviour void Start() { + } // Update is called once per frame @@ -74,4 +81,9 @@ public class GameManager : MonoBehaviour currentWeapon = i; hudManager.SetWeapon(i); } + + public void TriggerSpawningEnemy() { + isEnemySpawning = !isEnemySpawning; + enemyManager.SetActive(isEnemySpawning); + } } diff --git a/Assets/Scripts/Shop/ShopManager.cs b/Assets/Scripts/Shop/ShopManager.cs index 4d8f2e79..7f2e30ac 100644 --- a/Assets/Scripts/Shop/ShopManager.cs +++ b/Assets/Scripts/Shop/ShopManager.cs @@ -16,14 +16,9 @@ public class ShopManager : MonoBehaviour // Coins public TMP_Text coins; - // Timer - public float shopTimer = 30f; - public TMP_Text timerText; - void Start() { coins.text = GameManager.gameManager.coins.ToString(); - timerText.text = shopTimer.ToString(); for (int i = 0; i < petData.Count; i++) { @@ -51,12 +46,7 @@ public class ShopManager : MonoBehaviour // Update is called once per frame void Update() { - shopTimer -= Time.deltaTime; - timerText.text = shopTimer.ToString(); - - if (shopTimer <= 0f) { - GameManager.gameManager.isShopOpen = false; - } + } public void BuyPet(PetData petData) diff --git a/Assets/Scripts/Shop/ShopTrigger.cs b/Assets/Scripts/Shop/ShopTrigger.cs new file mode 100644 index 00000000..3ed51978 --- /dev/null +++ b/Assets/Scripts/Shop/ShopTrigger.cs @@ -0,0 +1,32 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using TMPro; + +public class ShopTrigger : MonoBehaviour +{ + // Timer + public float shopTimer = 30f; + public GameObject shopTimerUI; + + private TMP_Text timerText; + + void Start() + { + timerText = shopTimerUI.transform.GetChild(0).GetComponent<TMP_Text>(); + timerText.text = shopTimer.ToString("F1"); + } + + // Update is called once per frame + void Update() + { + shopTimer -= Time.deltaTime; + timerText.text = shopTimer.ToString("F1"); + + if (shopTimer <= 0f) { + GameManager.gameManager.isShopOpen = false; + shopTimerUI.SetActive(false); + GameManager.gameManager.TriggerSpawningEnemy(); + } + } +} diff --git a/Assets/Scripts/Shop/ShopTrigger.cs.meta b/Assets/Scripts/Shop/ShopTrigger.cs.meta new file mode 100644 index 00000000..6c60b271 --- /dev/null +++ b/Assets/Scripts/Shop/ShopTrigger.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 4133a988ba6a2734a94e70d74c4e9bda +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Textures/bow-arrow.png.meta b/Assets/Textures/bow-arrow.png.meta index ccc4a25a..ac6e6036 100644 --- a/Assets/Textures/bow-arrow.png.meta +++ b/Assets/Textures/bow-arrow.png.meta @@ -1,12 +1,12 @@ fileFormatVersion: 2 -guid: f4c9e32b62c4d414685139ac10c0bcb8 +guid: 8491415a5020ad04c97cba22a525107d TextureImporter: internalIDToNameTable: [] externalObjects: {} serializedVersion: 12 mipmaps: mipMapMode: 0 - enableMipMap: 0 + enableMipMap: 1 sRGBTexture: 1 linearTexture: 0 fadeOut: 0 @@ -36,13 +36,13 @@ TextureImporter: filterMode: 1 aniso: 1 mipBias: 0 - wrapU: 1 - wrapV: 1 + wrapU: 0 + wrapV: 0 wrapW: 0 - nPOTScale: 0 + nPOTScale: 1 lightmap: 0 compressionQuality: 50 - spriteMode: 1 + spriteMode: 0 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 @@ -51,9 +51,9 @@ TextureImporter: spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 - alphaIsTransparency: 1 + alphaIsTransparency: 0 spriteTessellationDetail: -1 - textureType: 8 + textureType: 0 textureShape: 1 singleChannelComponent: 0 flipbookRows: 1 @@ -107,7 +107,7 @@ TextureImporter: outline: [] physicsShape: [] bones: [] - spriteID: 5e97eb03825dee720800000000000000 + spriteID: internalID: 0 vertices: [] indices: -- GitLab