diff --git a/asset_dev/characters/gfolf_girl/gfolf_girl.blend b/asset_dev/characters/gfolf_girl/gfolf_girl.blend index 152ab62..5d3f935 100644 --- a/asset_dev/characters/gfolf_girl/gfolf_girl.blend +++ b/asset_dev/characters/gfolf_girl/gfolf_girl.blend @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f303aa556c8515e83d2994cd0e9aa4b6c73c97cdeac207000efdbd12fa24370d -size 3693536 +oid sha256:4978e760355b113e2528dd058aade129bc19f93e100da9c1fa038fdffcad70ee +size 3695872 diff --git a/asset_dev/characters/gfolf_girl/gfolf_girl.blend1 b/asset_dev/characters/gfolf_girl/gfolf_girl.blend1 index fc3e758..1e3eb02 100644 Binary files a/asset_dev/characters/gfolf_girl/gfolf_girl.blend1 and b/asset_dev/characters/gfolf_girl/gfolf_girl.blend1 differ diff --git a/assets/models/characters/gfolf_girl/gfolf_girl.bin b/assets/models/characters/gfolf_girl/gfolf_girl.bin index 4bb89ec..a6a1172 100644 Binary files a/assets/models/characters/gfolf_girl/gfolf_girl.bin and b/assets/models/characters/gfolf_girl/gfolf_girl.bin differ diff --git a/assets/models/characters/gfolf_girl/gfolf_girl.gltf b/assets/models/characters/gfolf_girl/gfolf_girl.gltf index 0e2737f..32323a6 100644 --- a/assets/models/characters/gfolf_girl/gfolf_girl.gltf +++ b/assets/models/characters/gfolf_girl/gfolf_girl.gltf @@ -5966,7 +5966,7 @@ "componentType":5126, "count":2, "max":[ - 0.15 + 0.5 ], "min":[ 0.016666666666666666 @@ -5994,9 +5994,9 @@ { "bufferView":94, "componentType":5126, - "count":9, + "count":30, "max":[ - 0.15 + 0.5 ], "min":[ 0.016666666666666666 @@ -6006,13 +6006,13 @@ { "bufferView":95, "componentType":5126, - "count":9, + "count":30, "type":"VEC3" }, { "bufferView":96, "componentType":5126, - "count":9, + "count":30, "type":"VEC4" }, { @@ -6030,7 +6030,7 @@ { "bufferView":99, "componentType":5126, - "count":9, + "count":30, "type":"VEC4" }, { @@ -6048,7 +6048,7 @@ { "bufferView":102, "componentType":5126, - "count":9, + "count":30, "type":"VEC4" }, { @@ -6066,7 +6066,7 @@ { "bufferView":105, "componentType":5126, - "count":9, + "count":30, "type":"VEC4" }, { @@ -6084,7 +6084,7 @@ { "bufferView":108, "componentType":5126, - "count":9, + "count":30, "type":"VEC4" }, { @@ -6102,7 +6102,7 @@ { "bufferView":111, "componentType":5126, - "count":9, + "count":30, "type":"VEC4" }, { @@ -6114,13 +6114,13 @@ { "bufferView":113, "componentType":5126, - "count":9, + "count":30, "type":"VEC3" }, { "bufferView":114, "componentType":5126, - "count":9, + "count":30, "type":"VEC4" }, { @@ -6132,7 +6132,7 @@ { "bufferView":116, "componentType":5126, - "count":9, + "count":30, "type":"VEC3" }, { @@ -6156,7 +6156,7 @@ { "bufferView":120, "componentType":5126, - "count":9, + "count":30, "type":"VEC4" }, { @@ -6174,7 +6174,7 @@ { "bufferView":123, "componentType":5126, - "count":9, + "count":30, "type":"VEC4" }, { @@ -6192,7 +6192,7 @@ { "bufferView":126, "componentType":5126, - "count":9, + "count":30, "type":"VEC4" }, { @@ -6204,13 +6204,13 @@ { "bufferView":128, "componentType":5126, - "count":9, + "count":30, "type":"VEC3" }, { "bufferView":129, "componentType":5126, - "count":9, + "count":30, "type":"VEC4" }, { @@ -6222,7 +6222,7 @@ { "bufferView":131, "componentType":5126, - "count":9, + "count":30, "type":"VEC3" }, { @@ -6246,7 +6246,7 @@ { "bufferView":135, "componentType":5126, - "count":9, + "count":30, "type":"VEC4" }, { @@ -6264,7 +6264,7 @@ { "bufferView":138, "componentType":5126, - "count":9, + "count":30, "type":"VEC4" }, { @@ -6282,7 +6282,7 @@ { "bufferView":141, "componentType":5126, - "count":9, + "count":30, "type":"VEC4" }, { @@ -6300,7 +6300,7 @@ { "bufferView":144, "componentType":5126, - "count":9, + "count":30, "type":"VEC4" }, { @@ -6318,7 +6318,7 @@ { "bufferView":147, "componentType":5126, - "count":9, + "count":30, "type":"VEC4" }, { @@ -6336,7 +6336,7 @@ { "bufferView":150, "componentType":5126, - "count":9, + "count":30, "type":"VEC4" }, { @@ -6348,13 +6348,13 @@ { "bufferView":152, "componentType":5126, - "count":9, + "count":30, "type":"VEC3" }, { "bufferView":153, "componentType":5126, - "count":9, + "count":30, "type":"VEC4" }, { @@ -6384,13 +6384,13 @@ { "bufferView":158, "componentType":5126, - "count":9, + "count":30, "type":"VEC3" }, { "bufferView":159, "componentType":5126, - "count":9, + "count":30, "type":"VEC4" }, { @@ -8792,1828 +8792,1828 @@ }, { "buffer":0, - "byteLength":36, + "byteLength":120, "byteOffset":80368 }, { "buffer":0, - "byteLength":108, - "byteOffset":80404 + "byteLength":360, + "byteOffset":80488 }, { "buffer":0, - "byteLength":144, - "byteOffset":80512 - }, - { - "buffer":0, - "byteLength":24, - "byteOffset":80656 - }, - { - "buffer":0, - "byteLength":24, - "byteOffset":80680 - }, - { - "buffer":0, - "byteLength":144, - "byteOffset":80704 - }, - { - "buffer":0, - "byteLength":24, + "byteLength":480, "byteOffset":80848 }, { "buffer":0, "byteLength":24, - "byteOffset":80872 - }, - { - "buffer":0, - "byteLength":144, - "byteOffset":80896 + "byteOffset":81328 }, { "buffer":0, "byteLength":24, - "byteOffset":81040 + "byteOffset":81352 + }, + { + "buffer":0, + "byteLength":480, + "byteOffset":81376 }, { "buffer":0, "byteLength":24, - "byteOffset":81064 - }, - { - "buffer":0, - "byteLength":144, - "byteOffset":81088 + "byteOffset":81856 }, { "buffer":0, "byteLength":24, - "byteOffset":81232 + "byteOffset":81880 + }, + { + "buffer":0, + "byteLength":480, + "byteOffset":81904 }, { "buffer":0, "byteLength":24, - "byteOffset":81256 - }, - { - "buffer":0, - "byteLength":144, - "byteOffset":81280 + "byteOffset":82384 }, { "buffer":0, "byteLength":24, - "byteOffset":81424 + "byteOffset":82408 + }, + { + "buffer":0, + "byteLength":480, + "byteOffset":82432 }, { "buffer":0, "byteLength":24, - "byteOffset":81448 - }, - { - "buffer":0, - "byteLength":144, - "byteOffset":81472 + "byteOffset":82912 }, { "buffer":0, "byteLength":24, - "byteOffset":81616 + "byteOffset":82936 }, { "buffer":0, - "byteLength":108, - "byteOffset":81640 - }, - { - "buffer":0, - "byteLength":144, - "byteOffset":81748 + "byteLength":480, + "byteOffset":82960 }, { "buffer":0, "byteLength":24, - "byteOffset":81892 - }, - { - "buffer":0, - "byteLength":108, - "byteOffset":81916 - }, - { - "buffer":0, - "byteLength":32, - "byteOffset":82024 + "byteOffset":83440 }, { "buffer":0, "byteLength":24, - "byteOffset":82056 + "byteOffset":83464 + }, + { + "buffer":0, + "byteLength":480, + "byteOffset":83488 }, { "buffer":0, "byteLength":24, - "byteOffset":82080 + "byteOffset":83968 }, { "buffer":0, - "byteLength":144, - "byteOffset":82104 + "byteLength":360, + "byteOffset":83992 + }, + { + "buffer":0, + "byteLength":480, + "byteOffset":84352 }, { "buffer":0, "byteLength":24, - "byteOffset":82248 + "byteOffset":84832 }, { "buffer":0, - "byteLength":24, - "byteOffset":82272 - }, - { - "buffer":0, - "byteLength":144, - "byteOffset":82296 - }, - { - "buffer":0, - "byteLength":24, - "byteOffset":82440 - }, - { - "buffer":0, - "byteLength":24, - "byteOffset":82464 - }, - { - "buffer":0, - "byteLength":144, - "byteOffset":82488 - }, - { - "buffer":0, - "byteLength":24, - "byteOffset":82632 - }, - { - "buffer":0, - "byteLength":108, - "byteOffset":82656 - }, - { - "buffer":0, - "byteLength":144, - "byteOffset":82764 - }, - { - "buffer":0, - "byteLength":24, - "byteOffset":82908 - }, - { - "buffer":0, - "byteLength":108, - "byteOffset":82932 - }, - { - "buffer":0, - "byteLength":32, - "byteOffset":83040 - }, - { - "buffer":0, - "byteLength":24, - "byteOffset":83072 - }, - { - "buffer":0, - "byteLength":24, - "byteOffset":83096 - }, - { - "buffer":0, - "byteLength":144, - "byteOffset":83120 - }, - { - "buffer":0, - "byteLength":24, - "byteOffset":83264 - }, - { - "buffer":0, - "byteLength":24, - "byteOffset":83288 - }, - { - "buffer":0, - "byteLength":144, - "byteOffset":83312 - }, - { - "buffer":0, - "byteLength":24, - "byteOffset":83456 - }, - { - "buffer":0, - "byteLength":24, - "byteOffset":83480 - }, - { - "buffer":0, - "byteLength":144, - "byteOffset":83504 - }, - { - "buffer":0, - "byteLength":24, - "byteOffset":83648 - }, - { - "buffer":0, - "byteLength":24, - "byteOffset":83672 - }, - { - "buffer":0, - "byteLength":144, - "byteOffset":83696 - }, - { - "buffer":0, - "byteLength":24, - "byteOffset":83840 - }, - { - "buffer":0, - "byteLength":24, - "byteOffset":83864 - }, - { - "buffer":0, - "byteLength":144, - "byteOffset":83888 - }, - { - "buffer":0, - "byteLength":24, - "byteOffset":84032 - }, - { - "buffer":0, - "byteLength":24, - "byteOffset":84056 - }, - { - "buffer":0, - "byteLength":144, - "byteOffset":84080 - }, - { - "buffer":0, - "byteLength":24, - "byteOffset":84224 - }, - { - "buffer":0, - "byteLength":108, - "byteOffset":84248 - }, - { - "buffer":0, - "byteLength":144, - "byteOffset":84356 - }, - { - "buffer":0, - "byteLength":24, - "byteOffset":84500 - }, - { - "buffer":0, - "byteLength":24, - "byteOffset":84524 - }, - { - "buffer":0, - "byteLength":32, - "byteOffset":84548 - }, - { - "buffer":0, - "byteLength":24, - "byteOffset":84580 - }, - { - "buffer":0, - "byteLength":108, - "byteOffset":84604 - }, - { - "buffer":0, - "byteLength":144, - "byteOffset":84712 - }, - { - "buffer":0, - "byteLength":24, + "byteLength":360, "byteOffset":84856 }, + { + "buffer":0, + "byteLength":32, + "byteOffset":85216 + }, { "buffer":0, "byteLength":24, - "byteOffset":84880 + "byteOffset":85248 + }, + { + "buffer":0, + "byteLength":24, + "byteOffset":85272 + }, + { + "buffer":0, + "byteLength":480, + "byteOffset":85296 + }, + { + "buffer":0, + "byteLength":24, + "byteOffset":85776 + }, + { + "buffer":0, + "byteLength":24, + "byteOffset":85800 + }, + { + "buffer":0, + "byteLength":480, + "byteOffset":85824 + }, + { + "buffer":0, + "byteLength":24, + "byteOffset":86304 + }, + { + "buffer":0, + "byteLength":24, + "byteOffset":86328 + }, + { + "buffer":0, + "byteLength":480, + "byteOffset":86352 + }, + { + "buffer":0, + "byteLength":24, + "byteOffset":86832 + }, + { + "buffer":0, + "byteLength":360, + "byteOffset":86856 + }, + { + "buffer":0, + "byteLength":480, + "byteOffset":87216 + }, + { + "buffer":0, + "byteLength":24, + "byteOffset":87696 + }, + { + "buffer":0, + "byteLength":360, + "byteOffset":87720 }, { "buffer":0, "byteLength":32, - "byteOffset":84904 + "byteOffset":88080 }, { "buffer":0, "byteLength":24, - "byteOffset":84936 + "byteOffset":88112 + }, + { + "buffer":0, + "byteLength":24, + "byteOffset":88136 + }, + { + "buffer":0, + "byteLength":480, + "byteOffset":88160 + }, + { + "buffer":0, + "byteLength":24, + "byteOffset":88640 + }, + { + "buffer":0, + "byteLength":24, + "byteOffset":88664 + }, + { + "buffer":0, + "byteLength":480, + "byteOffset":88688 + }, + { + "buffer":0, + "byteLength":24, + "byteOffset":89168 + }, + { + "buffer":0, + "byteLength":24, + "byteOffset":89192 + }, + { + "buffer":0, + "byteLength":480, + "byteOffset":89216 + }, + { + "buffer":0, + "byteLength":24, + "byteOffset":89696 + }, + { + "buffer":0, + "byteLength":24, + "byteOffset":89720 + }, + { + "buffer":0, + "byteLength":480, + "byteOffset":89744 + }, + { + "buffer":0, + "byteLength":24, + "byteOffset":90224 + }, + { + "buffer":0, + "byteLength":24, + "byteOffset":90248 + }, + { + "buffer":0, + "byteLength":480, + "byteOffset":90272 + }, + { + "buffer":0, + "byteLength":24, + "byteOffset":90752 + }, + { + "buffer":0, + "byteLength":24, + "byteOffset":90776 + }, + { + "buffer":0, + "byteLength":480, + "byteOffset":90800 + }, + { + "buffer":0, + "byteLength":24, + "byteOffset":91280 + }, + { + "buffer":0, + "byteLength":360, + "byteOffset":91304 + }, + { + "buffer":0, + "byteLength":480, + "byteOffset":91664 + }, + { + "buffer":0, + "byteLength":24, + "byteOffset":92144 + }, + { + "buffer":0, + "byteLength":24, + "byteOffset":92168 + }, + { + "buffer":0, + "byteLength":32, + "byteOffset":92192 + }, + { + "buffer":0, + "byteLength":24, + "byteOffset":92224 + }, + { + "buffer":0, + "byteLength":360, + "byteOffset":92248 + }, + { + "buffer":0, + "byteLength":480, + "byteOffset":92608 + }, + { + "buffer":0, + "byteLength":24, + "byteOffset":93088 + }, + { + "buffer":0, + "byteLength":24, + "byteOffset":93112 + }, + { + "buffer":0, + "byteLength":32, + "byteOffset":93136 + }, + { + "buffer":0, + "byteLength":24, + "byteOffset":93168 }, { "buffer":0, "byteLength":8, - "byteOffset":84960 + "byteOffset":93192 }, { "buffer":0, "byteLength":24, - "byteOffset":84968 + "byteOffset":93200 }, { "buffer":0, "byteLength":32, - "byteOffset":84992 + "byteOffset":93224 }, { "buffer":0, "byteLength":24, - "byteOffset":85024 + "byteOffset":93256 }, { "buffer":0, "byteLength":2556, - "byteOffset":85048 + "byteOffset":93280 }, { "buffer":0, "byteLength":7668, - "byteOffset":87604 + "byteOffset":95836 }, { "buffer":0, "byteLength":32, - "byteOffset":95272 + "byteOffset":103504 }, { "buffer":0, "byteLength":24, - "byteOffset":95304 + "byteOffset":103536 }, { "buffer":0, "byteLength":24, - "byteOffset":95328 + "byteOffset":103560 }, { "buffer":0, "byteLength":10224, - "byteOffset":95352 + "byteOffset":103584 }, { "buffer":0, "byteLength":24, - "byteOffset":105576 + "byteOffset":113808 }, { "buffer":0, "byteLength":24, - "byteOffset":105600 + "byteOffset":113832 }, { "buffer":0, "byteLength":10224, - "byteOffset":105624 + "byteOffset":113856 }, { "buffer":0, "byteLength":24, - "byteOffset":115848 + "byteOffset":124080 }, { "buffer":0, "byteLength":24, - "byteOffset":115872 + "byteOffset":124104 }, { "buffer":0, "byteLength":10224, - "byteOffset":115896 + "byteOffset":124128 }, { "buffer":0, "byteLength":24, - "byteOffset":126120 + "byteOffset":134352 }, { "buffer":0, "byteLength":24, - "byteOffset":126144 + "byteOffset":134376 }, { "buffer":0, "byteLength":10224, - "byteOffset":126168 + "byteOffset":134400 }, { "buffer":0, "byteLength":24, - "byteOffset":136392 + "byteOffset":144624 }, { "buffer":0, "byteLength":24, - "byteOffset":136416 + "byteOffset":144648 }, { "buffer":0, "byteLength":10224, - "byteOffset":136440 + "byteOffset":144672 }, { "buffer":0, "byteLength":24, - "byteOffset":146664 + "byteOffset":154896 }, { "buffer":0, "byteLength":7668, - "byteOffset":146688 + "byteOffset":154920 }, { "buffer":0, "byteLength":10224, - "byteOffset":154356 + "byteOffset":162588 }, { "buffer":0, "byteLength":24, - "byteOffset":164580 + "byteOffset":172812 }, { "buffer":0, "byteLength":24, - "byteOffset":164604 + "byteOffset":172836 }, { "buffer":0, "byteLength":32, - "byteOffset":164628 + "byteOffset":172860 }, { "buffer":0, "byteLength":24, - "byteOffset":164660 + "byteOffset":172892 }, { "buffer":0, "byteLength":24, - "byteOffset":164684 + "byteOffset":172916 }, { "buffer":0, "byteLength":10224, - "byteOffset":164708 + "byteOffset":172940 }, { "buffer":0, "byteLength":24, - "byteOffset":174932 + "byteOffset":183164 }, { "buffer":0, "byteLength":24, - "byteOffset":174956 + "byteOffset":183188 }, { "buffer":0, "byteLength":10224, - "byteOffset":174980 + "byteOffset":183212 }, { "buffer":0, "byteLength":24, - "byteOffset":185204 + "byteOffset":193436 }, { "buffer":0, "byteLength":24, - "byteOffset":185228 + "byteOffset":193460 }, { "buffer":0, "byteLength":10224, - "byteOffset":185252 + "byteOffset":193484 }, { "buffer":0, "byteLength":24, - "byteOffset":195476 + "byteOffset":203708 }, { "buffer":0, "byteLength":7668, - "byteOffset":195500 + "byteOffset":203732 }, { "buffer":0, "byteLength":10224, - "byteOffset":203168 + "byteOffset":211400 }, { "buffer":0, "byteLength":24, - "byteOffset":213392 + "byteOffset":221624 }, { "buffer":0, "byteLength":24, - "byteOffset":213416 + "byteOffset":221648 }, { "buffer":0, "byteLength":32, - "byteOffset":213440 + "byteOffset":221672 }, { "buffer":0, "byteLength":24, - "byteOffset":213472 + "byteOffset":221704 }, { "buffer":0, "byteLength":24, - "byteOffset":213496 + "byteOffset":221728 }, { "buffer":0, "byteLength":10224, - "byteOffset":213520 + "byteOffset":221752 }, { "buffer":0, "byteLength":24, - "byteOffset":223744 + "byteOffset":231976 }, { "buffer":0, "byteLength":24, - "byteOffset":223768 + "byteOffset":232000 }, { "buffer":0, "byteLength":10224, - "byteOffset":223792 + "byteOffset":232024 }, { "buffer":0, "byteLength":24, - "byteOffset":234016 + "byteOffset":242248 }, { "buffer":0, "byteLength":24, - "byteOffset":234040 + "byteOffset":242272 }, { "buffer":0, "byteLength":10224, - "byteOffset":234064 + "byteOffset":242296 }, { "buffer":0, "byteLength":24, - "byteOffset":244288 + "byteOffset":252520 }, { "buffer":0, "byteLength":24, - "byteOffset":244312 + "byteOffset":252544 }, { "buffer":0, "byteLength":10224, - "byteOffset":244336 + "byteOffset":252568 }, { "buffer":0, "byteLength":24, - "byteOffset":254560 + "byteOffset":262792 }, { "buffer":0, "byteLength":24, - "byteOffset":254584 + "byteOffset":262816 }, { "buffer":0, "byteLength":10224, - "byteOffset":254608 + "byteOffset":262840 }, { "buffer":0, "byteLength":24, - "byteOffset":264832 + "byteOffset":273064 }, { "buffer":0, "byteLength":24, - "byteOffset":264856 + "byteOffset":273088 }, { "buffer":0, "byteLength":10224, - "byteOffset":264880 + "byteOffset":273112 }, { "buffer":0, "byteLength":24, - "byteOffset":275104 + "byteOffset":283336 }, { "buffer":0, "byteLength":24, - "byteOffset":275128 + "byteOffset":283360 }, { "buffer":0, "byteLength":32, - "byteOffset":275152 + "byteOffset":283384 }, { "buffer":0, "byteLength":24, - "byteOffset":275184 + "byteOffset":283416 }, { "buffer":0, "byteLength":24, - "byteOffset":275208 + "byteOffset":283440 }, { "buffer":0, "byteLength":32, - "byteOffset":275232 + "byteOffset":283464 }, { "buffer":0, "byteLength":24, - "byteOffset":275264 + "byteOffset":283496 }, { "buffer":0, "byteLength":24, - "byteOffset":275288 + "byteOffset":283520 }, { "buffer":0, "byteLength":32, - "byteOffset":275312 + "byteOffset":283544 }, { "buffer":0, "byteLength":24, - "byteOffset":275344 + "byteOffset":283576 }, { "buffer":0, "byteLength":24, - "byteOffset":275368 + "byteOffset":283600 }, { "buffer":0, "byteLength":32, - "byteOffset":275392 + "byteOffset":283624 }, { "buffer":0, "byteLength":24, - "byteOffset":275424 + "byteOffset":283656 }, { "buffer":0, "byteLength":4, - "byteOffset":275448 + "byteOffset":283680 }, { "buffer":0, "byteLength":12, - "byteOffset":275452 + "byteOffset":283684 }, { "buffer":0, "byteLength":16, - "byteOffset":275464 + "byteOffset":283696 }, { "buffer":0, "byteLength":12, - "byteOffset":275480 + "byteOffset":283712 }, { "buffer":0, "byteLength":12, - "byteOffset":275492 + "byteOffset":283724 }, { "buffer":0, "byteLength":16, - "byteOffset":275504 + "byteOffset":283736 }, { "buffer":0, "byteLength":12, - "byteOffset":275520 + "byteOffset":283752 }, { "buffer":0, "byteLength":12, - "byteOffset":275532 + "byteOffset":283764 }, { "buffer":0, "byteLength":16, - "byteOffset":275544 + "byteOffset":283776 }, { "buffer":0, "byteLength":12, - "byteOffset":275560 + "byteOffset":283792 }, { "buffer":0, "byteLength":12, - "byteOffset":275572 + "byteOffset":283804 }, { "buffer":0, "byteLength":16, - "byteOffset":275584 + "byteOffset":283816 }, { "buffer":0, "byteLength":12, - "byteOffset":275600 + "byteOffset":283832 }, { "buffer":0, "byteLength":12, - "byteOffset":275612 + "byteOffset":283844 }, { "buffer":0, "byteLength":16, - "byteOffset":275624 + "byteOffset":283856 }, { "buffer":0, "byteLength":12, - "byteOffset":275640 + "byteOffset":283872 }, { "buffer":0, "byteLength":12, - "byteOffset":275652 + "byteOffset":283884 }, { "buffer":0, "byteLength":16, - "byteOffset":275664 + "byteOffset":283896 }, { "buffer":0, "byteLength":12, - "byteOffset":275680 + "byteOffset":283912 }, { "buffer":0, "byteLength":12, - "byteOffset":275692 + "byteOffset":283924 }, { "buffer":0, "byteLength":16, - "byteOffset":275704 + "byteOffset":283936 }, { "buffer":0, "byteLength":12, - "byteOffset":275720 + "byteOffset":283952 }, { "buffer":0, "byteLength":12, - "byteOffset":275732 + "byteOffset":283964 }, { "buffer":0, "byteLength":16, - "byteOffset":275744 + "byteOffset":283976 }, { "buffer":0, "byteLength":12, - "byteOffset":275760 + "byteOffset":283992 }, { "buffer":0, "byteLength":12, - "byteOffset":275772 + "byteOffset":284004 }, { "buffer":0, "byteLength":16, - "byteOffset":275784 + "byteOffset":284016 }, { "buffer":0, "byteLength":12, - "byteOffset":275800 + "byteOffset":284032 }, { "buffer":0, "byteLength":12, - "byteOffset":275812 + "byteOffset":284044 }, { "buffer":0, "byteLength":16, - "byteOffset":275824 + "byteOffset":284056 }, { "buffer":0, "byteLength":12, - "byteOffset":275840 + "byteOffset":284072 }, { "buffer":0, "byteLength":12, - "byteOffset":275852 + "byteOffset":284084 }, { "buffer":0, "byteLength":16, - "byteOffset":275864 + "byteOffset":284096 }, { "buffer":0, "byteLength":12, - "byteOffset":275880 + "byteOffset":284112 }, { "buffer":0, "byteLength":12, - "byteOffset":275892 + "byteOffset":284124 }, { "buffer":0, "byteLength":16, - "byteOffset":275904 + "byteOffset":284136 }, { "buffer":0, "byteLength":12, - "byteOffset":275920 + "byteOffset":284152 }, { "buffer":0, "byteLength":12, - "byteOffset":275932 + "byteOffset":284164 }, { "buffer":0, "byteLength":16, - "byteOffset":275944 + "byteOffset":284176 }, { "buffer":0, "byteLength":12, - "byteOffset":275960 + "byteOffset":284192 }, { "buffer":0, "byteLength":12, - "byteOffset":275972 + "byteOffset":284204 }, { "buffer":0, "byteLength":16, - "byteOffset":275984 + "byteOffset":284216 }, { "buffer":0, "byteLength":12, - "byteOffset":276000 + "byteOffset":284232 }, { "buffer":0, "byteLength":12, - "byteOffset":276012 + "byteOffset":284244 }, { "buffer":0, "byteLength":16, - "byteOffset":276024 + "byteOffset":284256 }, { "buffer":0, "byteLength":12, - "byteOffset":276040 + "byteOffset":284272 }, { "buffer":0, "byteLength":12, - "byteOffset":276052 + "byteOffset":284284 }, { "buffer":0, "byteLength":16, - "byteOffset":276064 + "byteOffset":284296 }, { "buffer":0, "byteLength":12, - "byteOffset":276080 + "byteOffset":284312 }, { "buffer":0, "byteLength":12, - "byteOffset":276092 + "byteOffset":284324 }, { "buffer":0, "byteLength":16, - "byteOffset":276104 + "byteOffset":284336 }, { "buffer":0, "byteLength":12, - "byteOffset":276120 + "byteOffset":284352 }, { "buffer":0, "byteLength":12, - "byteOffset":276132 + "byteOffset":284364 }, { "buffer":0, "byteLength":16, - "byteOffset":276144 + "byteOffset":284376 }, { "buffer":0, "byteLength":12, - "byteOffset":276160 + "byteOffset":284392 }, { "buffer":0, "byteLength":12, - "byteOffset":276172 + "byteOffset":284404 }, { "buffer":0, "byteLength":16, - "byteOffset":276184 + "byteOffset":284416 }, { "buffer":0, "byteLength":12, - "byteOffset":276200 + "byteOffset":284432 }, { "buffer":0, "byteLength":12, - "byteOffset":276212 + "byteOffset":284444 }, { "buffer":0, "byteLength":16, - "byteOffset":276224 + "byteOffset":284456 }, { "buffer":0, "byteLength":12, - "byteOffset":276240 + "byteOffset":284472 }, { "buffer":0, "byteLength":12, - "byteOffset":276252 + "byteOffset":284484 }, { "buffer":0, "byteLength":16, - "byteOffset":276264 + "byteOffset":284496 }, { "buffer":0, "byteLength":12, - "byteOffset":276280 + "byteOffset":284512 }, { "buffer":0, "byteLength":12, - "byteOffset":276292 + "byteOffset":284524 }, { "buffer":0, "byteLength":16, - "byteOffset":276304 + "byteOffset":284536 }, { "buffer":0, "byteLength":12, - "byteOffset":276320 + "byteOffset":284552 }, { "buffer":0, "byteLength":12, - "byteOffset":276332 + "byteOffset":284564 }, { "buffer":0, "byteLength":16, - "byteOffset":276344 + "byteOffset":284576 }, { "buffer":0, "byteLength":12, - "byteOffset":276360 + "byteOffset":284592 }, { "buffer":0, "byteLength":12, - "byteOffset":276372 + "byteOffset":284604 }, { "buffer":0, "byteLength":16, - "byteOffset":276384 + "byteOffset":284616 }, { "buffer":0, "byteLength":12, - "byteOffset":276400 + "byteOffset":284632 }, { "buffer":0, "byteLength":8, - "byteOffset":276412 + "byteOffset":284644 }, { "buffer":0, "byteLength":24, - "byteOffset":276420 + "byteOffset":284652 }, { "buffer":0, "byteLength":32, - "byteOffset":276444 + "byteOffset":284676 }, { "buffer":0, "byteLength":24, - "byteOffset":276476 + "byteOffset":284708 }, { "buffer":0, "byteLength":320, - "byteOffset":276500 + "byteOffset":284732 }, { "buffer":0, "byteLength":960, - "byteOffset":276820 + "byteOffset":285052 }, { "buffer":0, "byteLength":1280, - "byteOffset":277780 + "byteOffset":286012 }, { "buffer":0, "byteLength":24, - "byteOffset":279060 + "byteOffset":287292 }, { "buffer":0, "byteLength":24, - "byteOffset":279084 + "byteOffset":287316 }, { "buffer":0, "byteLength":1280, - "byteOffset":279108 + "byteOffset":287340 }, { "buffer":0, "byteLength":24, - "byteOffset":280388 + "byteOffset":288620 }, { "buffer":0, "byteLength":24, - "byteOffset":280412 + "byteOffset":288644 }, { "buffer":0, "byteLength":1280, - "byteOffset":280436 + "byteOffset":288668 }, { "buffer":0, "byteLength":24, - "byteOffset":281716 + "byteOffset":289948 }, { "buffer":0, "byteLength":24, - "byteOffset":281740 + "byteOffset":289972 }, { "buffer":0, "byteLength":1280, - "byteOffset":281764 + "byteOffset":289996 }, { "buffer":0, "byteLength":24, - "byteOffset":283044 + "byteOffset":291276 }, { "buffer":0, "byteLength":24, - "byteOffset":283068 + "byteOffset":291300 }, { "buffer":0, "byteLength":1280, - "byteOffset":283092 + "byteOffset":291324 }, { "buffer":0, "byteLength":24, - "byteOffset":284372 + "byteOffset":292604 }, { "buffer":0, "byteLength":24, - "byteOffset":284396 + "byteOffset":292628 }, { "buffer":0, "byteLength":1280, - "byteOffset":284420 + "byteOffset":292652 }, { "buffer":0, "byteLength":24, - "byteOffset":285700 + "byteOffset":293932 }, { "buffer":0, "byteLength":960, - "byteOffset":285724 + "byteOffset":293956 }, { "buffer":0, "byteLength":1280, - "byteOffset":286684 + "byteOffset":294916 }, { "buffer":0, "byteLength":24, - "byteOffset":287964 + "byteOffset":296196 }, { "buffer":0, "byteLength":24, - "byteOffset":287988 + "byteOffset":296220 }, { "buffer":0, "byteLength":32, - "byteOffset":288012 + "byteOffset":296244 }, { "buffer":0, "byteLength":24, - "byteOffset":288044 + "byteOffset":296276 }, { "buffer":0, "byteLength":24, - "byteOffset":288068 + "byteOffset":296300 }, { "buffer":0, "byteLength":1280, - "byteOffset":288092 + "byteOffset":296324 }, { "buffer":0, "byteLength":24, - "byteOffset":289372 + "byteOffset":297604 }, { "buffer":0, "byteLength":24, - "byteOffset":289396 + "byteOffset":297628 }, { "buffer":0, "byteLength":1280, - "byteOffset":289420 + "byteOffset":297652 }, { "buffer":0, "byteLength":24, - "byteOffset":290700 + "byteOffset":298932 }, { "buffer":0, "byteLength":24, - "byteOffset":290724 + "byteOffset":298956 }, { "buffer":0, "byteLength":1280, - "byteOffset":290748 + "byteOffset":298980 }, { "buffer":0, "byteLength":24, - "byteOffset":292028 + "byteOffset":300260 }, { "buffer":0, "byteLength":960, - "byteOffset":292052 + "byteOffset":300284 }, { "buffer":0, "byteLength":1280, - "byteOffset":293012 + "byteOffset":301244 }, { "buffer":0, "byteLength":24, - "byteOffset":294292 + "byteOffset":302524 }, { "buffer":0, "byteLength":960, - "byteOffset":294316 + "byteOffset":302548 }, { "buffer":0, "byteLength":32, - "byteOffset":295276 + "byteOffset":303508 }, { "buffer":0, "byteLength":24, - "byteOffset":295308 + "byteOffset":303540 }, { "buffer":0, "byteLength":24, - "byteOffset":295332 + "byteOffset":303564 }, { "buffer":0, "byteLength":1280, - "byteOffset":295356 + "byteOffset":303588 }, { "buffer":0, "byteLength":24, - "byteOffset":296636 + "byteOffset":304868 }, { "buffer":0, "byteLength":24, - "byteOffset":296660 + "byteOffset":304892 }, { "buffer":0, "byteLength":1280, - "byteOffset":296684 + "byteOffset":304916 }, { "buffer":0, "byteLength":24, - "byteOffset":297964 + "byteOffset":306196 }, { "buffer":0, "byteLength":24, - "byteOffset":297988 + "byteOffset":306220 }, { "buffer":0, "byteLength":1280, - "byteOffset":298012 + "byteOffset":306244 }, { "buffer":0, "byteLength":24, - "byteOffset":299292 + "byteOffset":307524 }, { "buffer":0, "byteLength":24, - "byteOffset":299316 + "byteOffset":307548 }, { "buffer":0, "byteLength":1280, - "byteOffset":299340 + "byteOffset":307572 }, { "buffer":0, "byteLength":24, - "byteOffset":300620 + "byteOffset":308852 }, { "buffer":0, "byteLength":24, - "byteOffset":300644 + "byteOffset":308876 }, { "buffer":0, "byteLength":1280, - "byteOffset":300668 + "byteOffset":308900 }, { "buffer":0, "byteLength":24, - "byteOffset":301948 + "byteOffset":310180 }, { "buffer":0, "byteLength":24, - "byteOffset":301972 + "byteOffset":310204 }, { "buffer":0, "byteLength":1280, - "byteOffset":301996 + "byteOffset":310228 }, { "buffer":0, "byteLength":24, - "byteOffset":303276 + "byteOffset":311508 }, { "buffer":0, "byteLength":960, - "byteOffset":303300 + "byteOffset":311532 }, { "buffer":0, "byteLength":1280, - "byteOffset":304260 + "byteOffset":312492 }, { "buffer":0, "byteLength":24, - "byteOffset":305540 + "byteOffset":313772 }, { "buffer":0, "byteLength":24, - "byteOffset":305564 + "byteOffset":313796 }, { "buffer":0, "byteLength":32, - "byteOffset":305588 - }, - { - "buffer":0, - "byteLength":24, - "byteOffset":305620 - }, - { - "buffer":0, - "byteLength":960, - "byteOffset":305644 - }, - { - "buffer":0, - "byteLength":1280, - "byteOffset":306604 - }, - { - "buffer":0, - "byteLength":24, - "byteOffset":307884 - }, - { - "buffer":0, - "byteLength":24, - "byteOffset":307908 - }, - { - "buffer":0, - "byteLength":32, - "byteOffset":307932 - }, - { - "buffer":0, - "byteLength":24, - "byteOffset":307964 - }, - { - "buffer":0, - "byteLength":8, - "byteOffset":307988 - }, - { - "buffer":0, - "byteLength":24, - "byteOffset":307996 - }, - { - "buffer":0, - "byteLength":32, - "byteOffset":308020 - }, - { - "buffer":0, - "byteLength":24, - "byteOffset":308052 - }, - { - "buffer":0, - "byteLength":128, - "byteOffset":308076 - }, - { - "buffer":0, - "byteLength":384, - "byteOffset":308204 - }, - { - "buffer":0, - "byteLength":512, - "byteOffset":308588 - }, - { - "buffer":0, - "byteLength":24, - "byteOffset":309100 - }, - { - "buffer":0, - "byteLength":24, - "byteOffset":309124 - }, - { - "buffer":0, - "byteLength":512, - "byteOffset":309148 - }, - { - "buffer":0, - "byteLength":24, - "byteOffset":309660 - }, - { - "buffer":0, - "byteLength":24, - "byteOffset":309684 - }, - { - "buffer":0, - "byteLength":512, - "byteOffset":309708 - }, - { - "buffer":0, - "byteLength":24, - "byteOffset":310220 - }, - { - "buffer":0, - "byteLength":24, - "byteOffset":310244 - }, - { - "buffer":0, - "byteLength":512, - "byteOffset":310268 - }, - { - "buffer":0, - "byteLength":24, - "byteOffset":310780 - }, - { - "buffer":0, - "byteLength":24, - "byteOffset":310804 - }, - { - "buffer":0, - "byteLength":512, - "byteOffset":310828 - }, - { - "buffer":0, - "byteLength":24, - "byteOffset":311340 - }, - { - "buffer":0, - "byteLength":24, - "byteOffset":311364 - }, - { - "buffer":0, - "byteLength":512, - "byteOffset":311388 - }, - { - "buffer":0, - "byteLength":24, - "byteOffset":311900 - }, - { - "buffer":0, - "byteLength":384, - "byteOffset":311924 - }, - { - "buffer":0, - "byteLength":512, - "byteOffset":312308 - }, - { - "buffer":0, - "byteLength":24, - "byteOffset":312820 - }, - { - "buffer":0, - "byteLength":384, - "byteOffset":312844 - }, - { - "buffer":0, - "byteLength":32, - "byteOffset":313228 - }, - { - "buffer":0, - "byteLength":24, - "byteOffset":313260 - }, - { - "buffer":0, - "byteLength":24, - "byteOffset":313284 - }, - { - "buffer":0, - "byteLength":512, - "byteOffset":313308 - }, - { - "buffer":0, - "byteLength":24, "byteOffset":313820 }, { "buffer":0, "byteLength":24, - "byteOffset":313844 + "byteOffset":313852 }, { "buffer":0, - "byteLength":512, - "byteOffset":313868 + "byteLength":960, + "byteOffset":313876 + }, + { + "buffer":0, + "byteLength":1280, + "byteOffset":314836 }, { "buffer":0, "byteLength":24, - "byteOffset":314380 + "byteOffset":316116 }, { "buffer":0, "byteLength":24, - "byteOffset":314404 + "byteOffset":316140 }, { "buffer":0, - "byteLength":512, - "byteOffset":314428 + "byteLength":32, + "byteOffset":316164 }, { "buffer":0, "byteLength":24, - "byteOffset":314940 + "byteOffset":316196 + }, + { + "buffer":0, + "byteLength":8, + "byteOffset":316220 + }, + { + "buffer":0, + "byteLength":24, + "byteOffset":316228 + }, + { + "buffer":0, + "byteLength":32, + "byteOffset":316252 + }, + { + "buffer":0, + "byteLength":24, + "byteOffset":316284 + }, + { + "buffer":0, + "byteLength":128, + "byteOffset":316308 }, { "buffer":0, "byteLength":384, - "byteOffset":314964 + "byteOffset":316436 }, { "buffer":0, "byteLength":512, - "byteOffset":315348 + "byteOffset":316820 }, { "buffer":0, "byteLength":24, - "byteOffset":315860 + "byteOffset":317332 + }, + { + "buffer":0, + "byteLength":24, + "byteOffset":317356 + }, + { + "buffer":0, + "byteLength":512, + "byteOffset":317380 + }, + { + "buffer":0, + "byteLength":24, + "byteOffset":317892 + }, + { + "buffer":0, + "byteLength":24, + "byteOffset":317916 + }, + { + "buffer":0, + "byteLength":512, + "byteOffset":317940 + }, + { + "buffer":0, + "byteLength":24, + "byteOffset":318452 + }, + { + "buffer":0, + "byteLength":24, + "byteOffset":318476 + }, + { + "buffer":0, + "byteLength":512, + "byteOffset":318500 + }, + { + "buffer":0, + "byteLength":24, + "byteOffset":319012 + }, + { + "buffer":0, + "byteLength":24, + "byteOffset":319036 + }, + { + "buffer":0, + "byteLength":512, + "byteOffset":319060 + }, + { + "buffer":0, + "byteLength":24, + "byteOffset":319572 + }, + { + "buffer":0, + "byteLength":24, + "byteOffset":319596 + }, + { + "buffer":0, + "byteLength":512, + "byteOffset":319620 + }, + { + "buffer":0, + "byteLength":24, + "byteOffset":320132 }, { "buffer":0, "byteLength":384, - "byteOffset":315884 - }, - { - "buffer":0, - "byteLength":32, - "byteOffset":316268 - }, - { - "buffer":0, - "byteLength":24, - "byteOffset":316300 - }, - { - "buffer":0, - "byteLength":24, - "byteOffset":316324 + "byteOffset":320156 }, { "buffer":0, "byteLength":512, - "byteOffset":316348 + "byteOffset":320540 }, { "buffer":0, "byteLength":24, - "byteOffset":316860 - }, - { - "buffer":0, - "byteLength":24, - "byteOffset":316884 - }, - { - "buffer":0, - "byteLength":512, - "byteOffset":316908 - }, - { - "buffer":0, - "byteLength":24, - "byteOffset":317420 - }, - { - "buffer":0, - "byteLength":24, - "byteOffset":317444 - }, - { - "buffer":0, - "byteLength":512, - "byteOffset":317468 - }, - { - "buffer":0, - "byteLength":24, - "byteOffset":317980 - }, - { - "buffer":0, - "byteLength":24, - "byteOffset":318004 - }, - { - "buffer":0, - "byteLength":512, - "byteOffset":318028 - }, - { - "buffer":0, - "byteLength":24, - "byteOffset":318540 - }, - { - "buffer":0, - "byteLength":24, - "byteOffset":318564 - }, - { - "buffer":0, - "byteLength":512, - "byteOffset":318588 - }, - { - "buffer":0, - "byteLength":24, - "byteOffset":319100 - }, - { - "buffer":0, - "byteLength":24, - "byteOffset":319124 - }, - { - "buffer":0, - "byteLength":512, - "byteOffset":319148 - }, - { - "buffer":0, - "byteLength":24, - "byteOffset":319660 + "byteOffset":321052 }, { "buffer":0, "byteLength":384, - "byteOffset":319684 + "byteOffset":321076 + }, + { + "buffer":0, + "byteLength":32, + "byteOffset":321460 + }, + { + "buffer":0, + "byteLength":24, + "byteOffset":321492 + }, + { + "buffer":0, + "byteLength":24, + "byteOffset":321516 }, { "buffer":0, "byteLength":512, - "byteOffset":320068 + "byteOffset":321540 }, { "buffer":0, "byteLength":24, - "byteOffset":320580 + "byteOffset":322052 }, { "buffer":0, "byteLength":24, - "byteOffset":320604 + "byteOffset":322076 + }, + { + "buffer":0, + "byteLength":512, + "byteOffset":322100 + }, + { + "buffer":0, + "byteLength":24, + "byteOffset":322612 + }, + { + "buffer":0, + "byteLength":24, + "byteOffset":322636 + }, + { + "buffer":0, + "byteLength":512, + "byteOffset":322660 + }, + { + "buffer":0, + "byteLength":24, + "byteOffset":323172 + }, + { + "buffer":0, + "byteLength":384, + "byteOffset":323196 + }, + { + "buffer":0, + "byteLength":512, + "byteOffset":323580 + }, + { + "buffer":0, + "byteLength":24, + "byteOffset":324092 + }, + { + "buffer":0, + "byteLength":384, + "byteOffset":324116 }, { "buffer":0, "byteLength":32, - "byteOffset":320628 + "byteOffset":324500 }, { "buffer":0, "byteLength":24, - "byteOffset":320660 + "byteOffset":324532 }, { "buffer":0, "byteLength":24, - "byteOffset":320684 + "byteOffset":324556 + }, + { + "buffer":0, + "byteLength":512, + "byteOffset":324580 + }, + { + "buffer":0, + "byteLength":24, + "byteOffset":325092 + }, + { + "buffer":0, + "byteLength":24, + "byteOffset":325116 + }, + { + "buffer":0, + "byteLength":512, + "byteOffset":325140 + }, + { + "buffer":0, + "byteLength":24, + "byteOffset":325652 + }, + { + "buffer":0, + "byteLength":24, + "byteOffset":325676 + }, + { + "buffer":0, + "byteLength":512, + "byteOffset":325700 + }, + { + "buffer":0, + "byteLength":24, + "byteOffset":326212 + }, + { + "buffer":0, + "byteLength":24, + "byteOffset":326236 + }, + { + "buffer":0, + "byteLength":512, + "byteOffset":326260 + }, + { + "buffer":0, + "byteLength":24, + "byteOffset":326772 + }, + { + "buffer":0, + "byteLength":24, + "byteOffset":326796 + }, + { + "buffer":0, + "byteLength":512, + "byteOffset":326820 + }, + { + "buffer":0, + "byteLength":24, + "byteOffset":327332 + }, + { + "buffer":0, + "byteLength":24, + "byteOffset":327356 + }, + { + "buffer":0, + "byteLength":512, + "byteOffset":327380 + }, + { + "buffer":0, + "byteLength":24, + "byteOffset":327892 + }, + { + "buffer":0, + "byteLength":384, + "byteOffset":327916 + }, + { + "buffer":0, + "byteLength":512, + "byteOffset":328300 + }, + { + "buffer":0, + "byteLength":24, + "byteOffset":328812 + }, + { + "buffer":0, + "byteLength":24, + "byteOffset":328836 }, { "buffer":0, "byteLength":32, - "byteOffset":320708 + "byteOffset":328860 }, { "buffer":0, "byteLength":24, - "byteOffset":320740 + "byteOffset":328892 }, { "buffer":0, "byteLength":24, - "byteOffset":320764 + "byteOffset":328916 }, { "buffer":0, "byteLength":32, - "byteOffset":320788 + "byteOffset":328940 }, { "buffer":0, "byteLength":24, - "byteOffset":320820 + "byteOffset":328972 + }, + { + "buffer":0, + "byteLength":24, + "byteOffset":328996 + }, + { + "buffer":0, + "byteLength":32, + "byteOffset":329020 + }, + { + "buffer":0, + "byteLength":24, + "byteOffset":329052 } ], "samplers":[ @@ -10626,7 +10626,7 @@ ], "buffers":[ { - "byteLength":320844, + "byteLength":329076, "uri":"gfolf_girl.bin" } ] diff --git a/src/characters/player_characters/gfolf_girl/gfolf_girl.tscn b/src/characters/player_characters/gfolf_girl/gfolf_girl.tscn index b7d02f0..ed661a3 100644 --- a/src/characters/player_characters/gfolf_girl/gfolf_girl.tscn +++ b/src/characters/player_characters/gfolf_girl/gfolf_girl.tscn @@ -165,11 +165,8 @@ bones/22/scale = Vector3(1, 1, 1) bones/23/rotation = Quaternion(0.000222673, 0.707107, 0.707107, -0.000222504) bones/23/scale = Vector3(1, 1, 1) -[node name="Eyes_Closed" parent="Armature/Skeleton3D" index="1"] -visible = false - [node name="BoneAttachment3D" type="BoneAttachment3D" parent="Armature/Skeleton3D" index="6"] -transform = Transform3D(-0.0322545, -0.997872, -0.0566733, 0.99947, -0.0324594, 0.00269896, -0.00453261, -0.0565562, 0.998389, -2.5177, 5.22011, -0.516371) +transform = Transform3D(-0.949594, 0.297848, -0.0977661, -0.313159, -0.915477, 0.25265, -0.0142512, 0.270532, 0.962605, -0.14033, 3.24759, 0.85525) bone_name = "Hand.R" bone_idx = 11 @@ -179,7 +176,6 @@ transform = Transform3D(0.934826, 0.266239, -0.23498, -0.336326, 0.876157, -0.34 [node name="ReferenceClub" type="MeshInstance3D" parent="Armature/Skeleton3D/BoneAttachment3D/RightHandGrip" index="0"] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.205, 0) -visible = false mesh = SubResource("BoxMesh_363n0") skeleton = NodePath("../..") diff --git a/src/player/shot_setup/shot_setup.gd b/src/player/shot_setup/shot_setup.gd index 8e9b6e7..e9a22b0 100644 --- a/src/player/shot_setup/shot_setup.gd +++ b/src/player/shot_setup/shot_setup.gd @@ -154,6 +154,7 @@ var _tracking_camera: OrbitalCamera @onready var putt_ref: RayCast3D = %PuttRef @onready var putt_arrow: Node3D = %PuttArrow +@onready var downswing_timer: Timer = %DownswingTimer @onready var ball_return_timer: Timer = %BallReturnTimer @onready var camera_distance := zoom.position.z: @@ -416,10 +417,9 @@ func _on_phase_change(new_phase: Phase) -> void: hud.curve_bar.show() hud.start_curve_bar() Phase.DOWNSWING: - hud.power_bar.hide() - hud.curve_bar.hide() + hud.gauge_flourish() character.downswing() - shot_animation.play("swing_delay") # calls `take_shot` + downswing_timer.start() Phase.SHOT: hud.power_bar.hide() hud.curve_bar.hide() diff --git a/src/player/shot_setup/shot_setup.tscn b/src/player/shot_setup/shot_setup.tscn index 8ba1607..3182685 100644 --- a/src/player/shot_setup/shot_setup.tscn +++ b/src/player/shot_setup/shot_setup.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=17 format=3 uid="uid://cy7t2tc4y3b4"] +[gd_scene load_steps=16 format=3 uid="uid://cy7t2tc4y3b4"] [ext_resource type="Script" path="res://src/player/shot_setup/shot_setup.gd" id="1_r6ei4"] [ext_resource type="Script" path="res://src/player/shot_setup/ball_point.gd" id="2_e6i3g"] @@ -169,30 +169,10 @@ tracks/2/keys = { }] } -[sub_resource type="Animation" id="Animation_u8k07"] -resource_name = "swing_delay" -length = 0.0667 -step = 0.01 -tracks/0/type = "method" -tracks/0/imported = false -tracks/0/enabled = true -tracks/0/path = NodePath("%Direction/..") -tracks/0/interp = 1 -tracks/0/loop_wrap = true -tracks/0/keys = { -"times": PackedFloat32Array(0.0667), -"transitions": PackedFloat32Array(1), -"values": [{ -"args": [], -"method": &"finish_downswing" -}] -} - [sub_resource type="AnimationLibrary" id="AnimationLibrary_u78hq"] _data = { "RESET": SubResource("Animation_oks0y"), -"shoot": SubResource("Animation_e65hh"), -"swing_delay": SubResource("Animation_u8k07") +"shoot": SubResource("Animation_e65hh") } [sub_resource type="SphereShape3D" id="SphereShape3D_xvvdi"] @@ -340,6 +320,11 @@ libraries = { "": SubResource("AnimationLibrary_u78hq") } +[node name="DownswingTimer" type="Timer" parent="."] +unique_name_in_owner = true +wait_time = 0.42 +one_shot = true + [node name="BallReturnTimer" type="Timer" parent="."] unique_name_in_owner = true one_shot = true @@ -351,6 +336,7 @@ script = ExtResource("7_uh8kn") shape = SubResource("SphereShape3D_xvvdi") [connection signal="ball_changed" from="BallPoint" to="." method="_on_game_ball_changed"] +[connection signal="timeout" from="DownswingTimer" to="." method="finish_downswing"] [connection signal="timeout" from="BallReturnTimer" to="." method="_on_ball_return_timer_timeout"] [connection signal="ball_collision" from="Hitbox" to="." method="_on_hitbox_ball_collision"] [connection signal="body_entered" from="Hitbox" to="Hitbox" method="_on_body_entered"] diff --git a/src/shaders/ui_flash.gdshader b/src/shaders/ui_flash.gdshader new file mode 100644 index 0000000..edc7369 --- /dev/null +++ b/src/shaders/ui_flash.gdshader @@ -0,0 +1,9 @@ +shader_type canvas_item; + +uniform vec4 flash_color: source_color = vec4(1.0); + +void fragment() { + vec4 base_color = texture(TEXTURE, UV); + COLOR.rgb = mix(base_color.rgb, flash_color.rgb, flash_color.a); + COLOR.a = base_color.a; +} \ No newline at end of file diff --git a/src/ui/shot_hud/curve_bar/curve_bar.gd b/src/ui/shot_hud/curve_bar/curve_bar.gd index 9db9674..bb7ae64 100644 --- a/src/ui/shot_hud/curve_bar/curve_bar.gd +++ b/src/ui/shot_hud/curve_bar/curve_bar.gd @@ -20,7 +20,12 @@ const PIVOT_SCALE := -PI / 4 @onready var pivot: Control = %Pivot @onready var gradient_fill: TextureRect = %GradientFill @onready var gradient_tex: GradientTexture2D = gradient_fill.texture +@onready var animation_player: AnimationPlayer = $Reticle/AnimationPlayer func _ready() -> void: gradient = gradient + + +func flourish() -> void: + animation_player.play("flourish") diff --git a/src/ui/shot_hud/curve_bar/curve_bar.tscn b/src/ui/shot_hud/curve_bar/curve_bar.tscn index c64207a..3d5ded1 100644 --- a/src/ui/shot_hud/curve_bar/curve_bar.tscn +++ b/src/ui/shot_hud/curve_bar/curve_bar.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=6 format=3 uid="uid://mm02j126jo1h"] +[gd_scene load_steps=9 format=3 uid="uid://mm02j126jo1h"] [ext_resource type="Script" path="res://src/ui/shot_hud/curve_bar/curve_bar.gd" id="1_aqvdi"] [ext_resource type="Gradient" uid="uid://k7867gxaxx57" path="res://src/ui/shot_hud/curve_bar/one_sided_gradient.tres" id="2_f3fom"] @@ -14,52 +14,117 @@ fill_from = Vector2(0.5, 0.02) fill_to = Vector2(0.5, 0.37) metadata/_snap_enabled = true +[sub_resource type="Animation" id="Animation_pt3no"] +resource_name = "flourish" +length = 0.42 +step = 0.01 +tracks/0/type = "value" +tracks/0/imported = false +tracks/0/enabled = true +tracks/0/path = NodePath("Reticle:rotation") +tracks/0/interp = 2 +tracks/0/loop_wrap = true +tracks/0/keys = { +"times": PackedFloat32Array(0, 0.42), +"transitions": PackedFloat32Array(1.618, 1), +"update": 0, +"values": [0.0, 6.28319] +} +tracks/1/type = "value" +tracks/1/imported = false +tracks/1/enabled = true +tracks/1/path = NodePath("Reticle:scale") +tracks/1/interp = 2 +tracks/1/loop_wrap = true +tracks/1/keys = { +"times": PackedFloat32Array(0, 0.0333333, 0.2, 0.42), +"transitions": PackedFloat32Array(1, 1.618, 1.618, 1), +"update": 0, +"values": [Vector2(1, 1), Vector2(0.6, 0.6), Vector2(2, 2), Vector2(1, 1)] +} +tracks/2/type = "value" +tracks/2/imported = false +tracks/2/enabled = true +tracks/2/path = NodePath("Pivot/ArcBG:color") +tracks/2/interp = 1 +tracks/2/loop_wrap = true +tracks/2/keys = { +"times": PackedFloat32Array(0, 0.105, 0.21, 0.315, 0.42), +"transitions": PackedFloat32Array(1, 1, 1, 1, 1), +"update": 0, +"values": [Color(0.0352941, 0.0784314, 0.160784, 0.784314), Color(1, 1, 1, 1), Color(0.0352941, 0.0784314, 0.160784, 0.784314), Color(1, 1, 1, 1), Color(0.0352941, 0.0784314, 0.160784, 0.784314)] +} + +[sub_resource type="Animation" id="Animation_kfg2n"] +length = 0.001 +tracks/0/type = "value" +tracks/0/imported = false +tracks/0/enabled = true +tracks/0/path = NodePath("Reticle:rotation") +tracks/0/interp = 2 +tracks/0/loop_wrap = true +tracks/0/keys = { +"times": PackedFloat32Array(0), +"transitions": PackedFloat32Array(1), +"update": 0, +"values": [0.0] +} +tracks/1/type = "value" +tracks/1/imported = false +tracks/1/enabled = true +tracks/1/path = NodePath("Reticle:scale") +tracks/1/interp = 1 +tracks/1/loop_wrap = true +tracks/1/keys = { +"times": PackedFloat32Array(0), +"transitions": PackedFloat32Array(1), +"update": 0, +"values": [Vector2(1, 1)] +} +tracks/2/type = "value" +tracks/2/imported = false +tracks/2/enabled = true +tracks/2/path = NodePath("Pivot/ArcBG:color") +tracks/2/interp = 1 +tracks/2/loop_wrap = true +tracks/2/keys = { +"times": PackedFloat32Array(0), +"transitions": PackedFloat32Array(1), +"update": 0, +"values": [Color(0.0352941, 0.0784314, 0.160784, 0.784314)] +} + +[sub_resource type="AnimationLibrary" id="AnimationLibrary_eqkfk"] +_data = { +"RESET": SubResource("Animation_kfg2n"), +"flourish": SubResource("Animation_pt3no") +} + [node name="CurveBar" type="Control"] layout_mode = 3 -anchors_preset = 15 -anchor_right = 1.0 -anchor_bottom = 1.0 +anchors_preset = 8 +anchor_left = 0.5 +anchor_top = 0.5 +anchor_right = 0.5 +anchor_bottom = 0.5 grow_horizontal = 2 grow_vertical = 2 script = ExtResource("1_aqvdi") gradient = ExtResource("2_f3fom") -[node name="Reticle" type="TextureRect" parent="."] -texture_filter = 1 -layout_mode = 1 -anchors_preset = 8 -anchor_left = 0.5 -anchor_top = 0.5 -anchor_right = 0.5 -anchor_bottom = 0.5 -offset_left = -20.0 -offset_top = -20.0 -offset_right = 20.0 -offset_bottom = 20.0 -grow_horizontal = 2 -grow_vertical = 2 -texture = ExtResource("3_2tv33") - -[node name="Pivot" type="Control" parent="Reticle"] +[node name="Pivot" type="Control" parent="."] unique_name_in_owner = true show_behind_parent = true texture_filter = 6 custom_minimum_size = Vector2(600, 600) -layout_mode = 1 -anchors_preset = 8 -anchor_left = 0.5 -anchor_top = 0.5 -anchor_right = 0.5 -anchor_bottom = 0.5 +anchors_preset = 0 offset_left = -300.0 offset_top = -32.0 offset_right = 300.0 offset_bottom = 568.0 -grow_horizontal = 2 -grow_vertical = 2 pivot_offset = Vector2(300, 300) -[node name="ArcBG" type="Control" parent="Reticle/Pivot"] +[node name="ArcBG" type="Control" parent="Pivot"] layout_mode = 1 anchors_preset = 15 anchor_right = 1.0 @@ -72,7 +137,7 @@ arc_end = -0.785398 width = 32.0 color = Color(0.0352941, 0.0784314, 0.160784, 0.784314) -[node name="MarginContainer" type="MarginContainer" parent="Reticle/Pivot"] +[node name="MarginContainer" type="MarginContainer" parent="Pivot"] layout_mode = 1 anchors_preset = 15 anchor_right = 1.0 @@ -84,7 +149,7 @@ theme_override_constants/margin_top = 3 theme_override_constants/margin_right = 3 theme_override_constants/margin_bottom = 3 -[node name="ArcFill" type="Control" parent="Reticle/Pivot/MarginContainer"] +[node name="ArcFill" type="Control" parent="Pivot/MarginContainer"] clip_children = 1 layout_mode = 2 script = ExtResource("4_s2bpl") @@ -92,7 +157,7 @@ arc_start = -2.35619 arc_end = -0.785398 width = 26.0 -[node name="GradientFill" type="TextureRect" parent="Reticle/Pivot/MarginContainer/ArcFill"] +[node name="GradientFill" type="TextureRect" parent="Pivot/MarginContainer/ArcFill"] unique_name_in_owner = true layout_mode = 1 anchors_preset = 15 @@ -101,3 +166,19 @@ anchor_bottom = 1.0 grow_horizontal = 2 grow_vertical = 2 texture = SubResource("GradientTexture2D_o88ik") + +[node name="Reticle" type="TextureRect" parent="."] +texture_filter = 1 +layout_mode = 0 +offset_left = -20.0 +offset_top = -20.0 +offset_right = 20.0 +offset_bottom = 20.0 +pivot_offset = Vector2(20, 20) +texture = ExtResource("3_2tv33") + +[node name="AnimationPlayer" type="AnimationPlayer" parent="Reticle"] +root_node = NodePath("../..") +libraries = { +"": SubResource("AnimationLibrary_eqkfk") +} diff --git a/src/ui/shot_hud/shot_hud.gd b/src/ui/shot_hud/shot_hud.gd index d818970..ebb338f 100644 --- a/src/ui/shot_hud/shot_hud.gd +++ b/src/ui/shot_hud/shot_hud.gd @@ -81,6 +81,10 @@ func reset_curve_bar() -> void: _curve_animation.stop() +func gauge_flourish() -> void: + curve_bar.flourish() + + func play_nice_animation() -> void: _nice_animation.play("display") diff --git a/src/ui/shot_hud/shot_hud.tscn b/src/ui/shot_hud/shot_hud.tscn index d5b9506..803d4d5 100644 --- a/src/ui/shot_hud/shot_hud.tscn +++ b/src/ui/shot_hud/shot_hud.tscn @@ -671,7 +671,6 @@ script = ExtResource("3_6groq") [node name="PowerBar" type="TextureProgressBar" parent="ShotGauges/PowerGauge/Rumbler"] unique_name_in_owner = true -visible = false texture_filter = 5 custom_minimum_size = Vector2(64, 0) layout_mode = 1