diff --git a/cocos/editor-support/cocostudio/CocoStudio.h b/cocos/editor-support/cocostudio/CocoStudio.h index 35a5be5013..5a8a2e9c9a 100644 --- a/cocos/editor-support/cocostudio/CocoStudio.h +++ b/cocos/editor-support/cocostudio/CocoStudio.h @@ -63,6 +63,5 @@ THE SOFTWARE. #include "cocostudio/TimelineAction/CCTimeLine.h" #include "cocostudio/TimelineAction/CCTimelineAction.h" #include "cocostudio/TimelineAction/CCTimelineActionCache.h" -#include "cocostudio/TimelineAction/CCAsyncReader.h" #endif diff --git a/cocos/editor-support/cocostudio/TimelineAction/CCAsyncReader.cpp b/cocos/editor-support/cocostudio/TimelineAction/CCAsyncReader.cpp deleted file mode 100644 index 913be0b066..0000000000 --- a/cocos/editor-support/cocostudio/TimelineAction/CCAsyncReader.cpp +++ /dev/null @@ -1,165 +0,0 @@ -#include "CCAsyncReader.h" -#include "cocos2d.h" - -using namespace cocos2d; - -namespace cocostudio { - -static AsyncReader* _sharedAsyncReader = nullptr; - - -AsyncReader* AsyncReader::getInstance() -{ - if (! _sharedAsyncReader) - { - _sharedAsyncReader = new AsyncReader(); - } - - return _sharedAsyncReader; -} - -void AsyncReader::destroyInstance() -{ - CC_SAFE_DELETE(_sharedAsyncReader); -} - -AsyncReader::AsyncReader() - : _loadingThread(nullptr) - , _asyncStructQueue(nullptr) - , _refInfoQueue(nullptr) - , _needQuit(false) - , _asyncRefCount(0) -{ -} - -void AsyncReader::readFileAsync(const std::string &path, std::function loadingCallBack, std::function loadedCallback) -{ - Ref *ref = nullptr; - - // lazy init - if (_asyncStructQueue == nullptr) - { - _asyncStructQueue = new std::queue(); - _refInfoQueue = new std::deque(); - - // create a new thread to load images - _loadingThread = new std::thread(&AsyncReader::loadFile, this); - - _needQuit = false; - } - - if (0 == _asyncRefCount) - { - Director::getInstance()->getScheduler()->schedule(schedule_selector(AsyncReader::loadFileAsyncCallBack), this, 0, false); - } - - ++_asyncRefCount; - - // generate async struct - std::string fullpath = FileUtils::getInstance()->fullPathForFilename(path); - AsyncStruct *data = new AsyncStruct(fullpath, loadingCallBack, loadedCallback); - - // add async struct into queue - _asyncStructQueueMutex.lock(); - _asyncStructQueue->push(data); - _asyncStructQueueMutex.unlock(); - - _sleepCondition.notify_one(); -} - - -void AsyncReader::loadFile() -{ - AsyncStruct *asyncStruct = nullptr; - - while (true) - { - std::queue *pQueue = _asyncStructQueue; - _asyncStructQueueMutex.lock(); - if (pQueue->empty()) - { - _asyncStructQueueMutex.unlock(); - if (_needQuit) { - break; - } - else { - std::unique_lock lk(_sleepMutex); - _sleepCondition.wait(lk); - continue; - } - } - else - { - asyncStruct = pQueue->front(); - pQueue->pop(); - _asyncStructQueueMutex.unlock(); - } - - Ref *ref = nullptr; - - const std::string& filename = asyncStruct->filename; - // generate ref - ref = asyncStruct->loadingCallBack(filename); - if (!ref) - continue; - - ref->retain(); - - // generate image info - RefInfo *refInfo = new RefInfo(); - refInfo->asyncStruct = asyncStruct; - refInfo->ref = ref; - - // put the image info into the queue - _refInfoMutex.lock(); - _refInfoQueue->push_back(refInfo); - _refInfoMutex.unlock(); - } - - if(_asyncStructQueue != nullptr) - { - delete _asyncStructQueue; - _asyncStructQueue = nullptr; - delete _refInfoQueue; - _refInfoQueue = nullptr; - } -} - -void AsyncReader::loadFileAsyncCallBack(float dt) -{ - // the image is generated in loading thread - std::deque *refsQueue = _refInfoQueue; - - _refInfoMutex.lock(); - if (refsQueue->empty()) - { - _refInfoMutex.unlock(); - } - else - { - RefInfo *refInfo = refsQueue->front(); - refsQueue->pop_front(); - _refInfoMutex.unlock(); - - AsyncStruct *asyncStruct = refInfo->asyncStruct; - Ref *ref = refInfo->ref; - - if (asyncStruct->loadedCallback) - { - asyncStruct->loadedCallback(ref); - } - - ref->release(); - - delete asyncStruct; - delete refInfo; - - --_asyncRefCount; - if (0 == _asyncRefCount) - { - Director::getInstance()->getScheduler()->unschedule(schedule_selector(AsyncReader::loadFileAsyncCallBack), this); - } - } -} - -} \ No newline at end of file diff --git a/cocos/editor-support/cocostudio/TimelineAction/CCAsyncReader.h b/cocos/editor-support/cocostudio/TimelineAction/CCAsyncReader.h deleted file mode 100644 index 3ba052c5dd..0000000000 --- a/cocos/editor-support/cocostudio/TimelineAction/CCAsyncReader.h +++ /dev/null @@ -1,83 +0,0 @@ -/**************************************************************************** -Copyright (c) 2013 cocos2d-x.org - -http://www.cocos2d-x.org - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -THE SOFTWARE. -****************************************************************************/ - -#ifndef __CCASYNCREADER_H__ -#define __CCASYNCREADER_H__ - -#include "cocos2d.h" - -namespace cocostudio { - -class AsyncReader : cocos2d::Ref -{ -public: - static AsyncReader* getInstance(); - static void destroyInstance(); - - AsyncReader(); - - virtual void readFileAsync(const std::string &filepath, std::function loadingCallBack, std::function loadedCallback); - -private: - void loadFile(); - void loadFileAsyncCallBack(float dt); - -public: - struct AsyncStruct - { - public: - AsyncStruct(const std::string& fn, std::function lc, std::function ec) - : filename(fn), loadingCallBack(lc), loadedCallback(ec) {} - - std::string filename; - std::function loadingCallBack; - std::function loadedCallback; - }; - -protected: - typedef struct _RefInfo - { - AsyncStruct *asyncStruct; - Ref *ref; - } RefInfo; - - std::thread* _loadingThread; - - std::queue* _asyncStructQueue; - std::deque* _refInfoQueue; - - std::mutex _asyncStructQueueMutex; - std::mutex _refInfoMutex; - - std::mutex _sleepMutex; - std::condition_variable _sleepCondition; - - bool _needQuit; - - int _asyncRefCount; -}; - -} - -#endif /*__CCASYNCREADER_H__*/ \ No newline at end of file diff --git a/cocos/editor-support/cocostudio/TimelineAction/CCNodeCache.cpp b/cocos/editor-support/cocostudio/TimelineAction/CCNodeCache.cpp index 3b186c57b2..ceea31ad2d 100644 --- a/cocos/editor-support/cocostudio/TimelineAction/CCNodeCache.cpp +++ b/cocos/editor-support/cocostudio/TimelineAction/CCNodeCache.cpp @@ -182,8 +182,8 @@ cocos2d::Node* NodeCache::createNode(const std::string& filename) cocos2d::Node* NodeCache::loadNodeWithFile(const std::string& fileName) { // Read content from file - std::string fullPath = CCFileUtils::getInstance()->fullPathForFilename(fileName); - std::string contentStr = FileUtils::getInstance()->getStringFromFile(fullPath); + //std::string fullPath = CCFileUtils::getInstance()->fullPathForFilename(fileName); + std::string contentStr = FileUtils::getInstance()->getStringFromFile(fileName); cocos2d::Node* node = loadNodeWithContent(contentStr); @@ -214,7 +214,10 @@ cocos2d::Node* NodeCache::loadNodeWithContent(const std::string& content) // decode node tree const rapidjson::Value& subJson = DICTOOL->getSubDictionary_json(doc, NODE); - return loadNode(subJson); + cocos2d::Node* root = loadNode(subJson); + root->release(); + + return root; } cocos2d::Node* NodeCache::loadNode(const rapidjson::Value& json) @@ -239,6 +242,7 @@ cocos2d::Node* NodeCache::loadNode(const rapidjson::Value& json) if (child) { node->addChild(child); + child->release(); } } } @@ -307,6 +311,7 @@ void NodeCache::initNode(cocos2d::Node* node, const rapidjson::Value& json) Node* NodeCache::loadSimpleNode(const rapidjson::Value& json) { Node* node = Node::create(); + node->retain(); initNode(node, json); return node; @@ -326,6 +331,8 @@ cocos2d::Node* NodeCache::loadSubGraph(const rapidjson::Value& json) node = Node::create(); } + node->retain(); + initNode(node, json); return node; @@ -362,6 +369,8 @@ Node* NodeCache::loadSprite(const rapidjson::Value& json) sprite = Sprite::create(); } + sprite->retain(); + initNode(sprite, json); return sprite; @@ -374,6 +383,7 @@ Node* NodeCache::loadParticle(const rapidjson::Value& json) ParticleSystemQuad* particle = ParticleSystemQuad::create(filePath); particle->setTotalParticles(num); + particle->retain(); initNode(particle, json); @@ -388,6 +398,8 @@ cocos2d::Node* NodeCache::loadWidget(const rapidjson::Value& json) readerName.append("Reader"); Widget* widget = dynamic_cast(ObjectFactory::getInstance()->createObject(classname)); + widget->retain(); + WidgetReaderProtocol* reader = dynamic_cast(ObjectFactory::getInstance()->createObject(readerName)); _guiReader->setPropsForAllWidgetFromJsonDictionary(reader, widget, json); diff --git a/cocos/editor-support/cocostudio/proj.win32/libCocosStudio.vcxproj b/cocos/editor-support/cocostudio/proj.win32/libCocosStudio.vcxproj index b01803b7e2..b745923b5b 100644 --- a/cocos/editor-support/cocostudio/proj.win32/libCocosStudio.vcxproj +++ b/cocos/editor-support/cocostudio/proj.win32/libCocosStudio.vcxproj @@ -42,7 +42,6 @@ - @@ -109,7 +108,6 @@ - diff --git a/cocos/editor-support/cocostudio/proj.win32/libCocosStudio.vcxproj.filters b/cocos/editor-support/cocostudio/proj.win32/libCocosStudio.vcxproj.filters index 95512fbe8e..8983cd9162 100644 --- a/cocos/editor-support/cocostudio/proj.win32/libCocosStudio.vcxproj.filters +++ b/cocos/editor-support/cocostudio/proj.win32/libCocosStudio.vcxproj.filters @@ -246,9 +246,6 @@ TimelineAction - - TimelineAction - @@ -446,8 +443,5 @@ TimelineAction - - TimelineAction - \ No newline at end of file diff --git a/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioTimelineActionTest/TimelineActionTestScene.cpp b/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioTimelineActionTest/TimelineActionTestScene.cpp index 43c37e8d07..f828fa219e 100644 --- a/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioTimelineActionTest/TimelineActionTestScene.cpp +++ b/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioTimelineActionTest/TimelineActionTestScene.cpp @@ -163,73 +163,38 @@ void TimelineActionTestLayer::restartCallback(Ref *pSender) s->release(); } -Node* node = nullptr; -TimelineAction* action = nullptr; - void TimelineActionTestLayer::nextCallback(Ref *pSender) { - // Scene *s = new TimelineActionTestScene(); - // s->addChild( NextAnimationTest() ); - // Director::getInstance()->replaceScene(s); - // s->release(); - - int frameIndex = action->getCurrentFrame(); - int duration = action->getDuration(); - - ++frameIndex; - frameIndex = frameIndex == duration ? 0 : frameIndex; - - action->gotoFrameAndPause(frameIndex); + Scene *s = new TimelineActionTestScene(); + s->addChild( NextAnimationTest() ); + Director::getInstance()->replaceScene(s); + s->release(); } void TimelineActionTestLayer::backCallback(Ref *pSender) { - // Scene *s = new TimelineActionTestScene(); - // s->addChild( BackAnimationTest() ); - // Director::getInstance()->replaceScene(s); - // s->release(); - - int frameIndex = action->getCurrentFrame(); - int duration = action->getDuration(); - - --frameIndex; - frameIndex = frameIndex == -1 ? duration-1 : frameIndex; - - action->gotoFrameAndPause(frameIndex); + Scene *s = new TimelineActionTestScene(); + s->addChild( BackAnimationTest() ); + Director::getInstance()->replaceScene(s); + s->release(); } void TestTimelineAction::onEnter() { TimelineActionTestLayer::onEnter(); + Node* node = NodeCache::getInstance()->createNode("TimelineAction/boy_1.ExportJson"); + TimelineAction* action = TimelineActionCache::getInstance()->createAction("TimelineAction/boy_1.ExportJson"); - for(int i=0; i<100; i++) - { - AsyncReader::getInstance()->readFileAsync("TimelineAction/boy_1.ExportJson", CC_CALLBACK_1(TestTimelineAction::loadingRef, this), CC_CALLBACK_1(TestTimelineAction::loadedRef, this)); - } + node->runAction(action); + action->gotoFrameAndPlay(0, 60, true); + + node->setScale(0.4f); + node->setPosition(0,0); + + addChild(node); } std::string TestTimelineAction::title() const { return "Test AnimationElement"; } - -cocos2d::Ref* TestTimelineAction::loadingRef(std::string filename) -{ - return NodeCache::getInstance()->createNode(filename); -} - -void TestTimelineAction::loadedRef(cocos2d::Ref* ref) -{ - if(cocos2d::Node* node = dynamic_cast(ref)) - { - TimelineAction* action = TimelineActionCache::getInstance()->createAction("TimelineAction/boy_1.ExportJson"); - - node->runAction(action); - action->gotoFrameAndPlay(0, 60, true); - - node->setScale(0.4f); - node->setPosition(-200/*+i*5*/,0); - - addChild(node); - } -} diff --git a/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioTimelineActionTest/TimelineActionTestScene.h b/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioTimelineActionTest/TimelineActionTestScene.h index 5830cb6c34..a0501811b1 100644 --- a/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioTimelineActionTest/TimelineActionTestScene.h +++ b/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioTimelineActionTest/TimelineActionTestScene.h @@ -52,9 +52,6 @@ class TestTimelineAction : public TimelineActionTestLayer public: virtual void onEnter(); virtual std::string title() const override; - - cocos2d::Ref* loadingRef(std::string filename); - void loadedRef(cocos2d::Ref* ref); }; #endif // __ANIMATION_SCENE_H__ \ No newline at end of file diff --git a/tests/cpp-tests/Resources/TimelineAction/boy_1.ExportJson b/tests/cpp-tests/Resources/TimelineAction/boy_1.ExportJson index 1aa899dd1e..922dc50440 100644 --- a/tests/cpp-tests/Resources/TimelineAction/boy_1.ExportJson +++ b/tests/cpp-tests/Resources/TimelineAction/boy_1.ExportJson @@ -65,8 +65,8 @@ "path": "testAnimationResource/8.png", "plistFile": "" }, - "x": 68.0, - "y": 138.0, + "x": 72.0, + "y": 143.0, "scaleX": 1.0, "scaleY": 1.0, "rotation": 0.0, @@ -98,8 +98,8 @@ "path": "testAnimationResource/3.png", "plistFile": "" }, - "x": 18.0, - "y": 21.0, + "x": 38.0, + "y": 20.0, "scaleX": 1.0, "scaleY": 1.0, "rotation": 0.0, @@ -138,8 +138,8 @@ "path": "testAnimationResource/5.png", "plistFile": "" }, - "x": 145.0, - "y": 33.0, + "x": 144.0, + "y": 50.0, "scaleX": 1.0, "scaleY": 1.0, "rotation": 0.0, @@ -171,8 +171,8 @@ "path": "testAnimationResource/4.png", "plistFile": "" }, - "x": 66.0, - "y": 1.0, + "x": 60.0, + "y": -5.0, "scaleX": 1.0, "scaleY": 1.0, "rotation": 0.0, @@ -211,8 +211,8 @@ "path": "testAnimationResource/2.png", "plistFile": "" }, - "x": 200.0, - "y": 27.0, + "x": 196.0, + "y": 44.0, "scaleX": 1.0, "scaleY": 1.0, "rotation": 0.0, @@ -244,8 +244,8 @@ "path": "testAnimationResource/7.png", "plistFile": "" }, - "x": 155.0, - "y": 16.0, + "x": 164.0, + "y": 9.0, "scaleX": 1.0, "scaleY": 1.0, "rotation": 0.0, @@ -284,8 +284,8 @@ "path": "testAnimationResource/hat.png", "plistFile": "" }, - "x": 134.0, - "y": 308.0, + "x": 137.0, + "y": 301.0, "scaleX": 1.0, "scaleY": 1.0, "rotation": 0.0, @@ -320,8 +320,8 @@ "path": "testAnimationResource/1.png", "plistFile": "" }, - "x": 279.0, - "y": 144.0, + "x": 282.0, + "y": 152.0, "scaleX": 1.0, "scaleY": 1.0, "rotation": 0.0, @@ -356,7 +356,7 @@ "classname": "Node" }, "action": { - "duration": 60, + "duration": 130, "speed": 1.0, "timelines": [ { @@ -373,7 +373,7 @@ { "$type": "EditorCommon.JsonModel.Animation.TimeLinePointFrameSurrogate, EditorCommon", "x": 601.0, - "y": 260.0, + "y": 243.0, "frameIndex": 30, "tween": true }, @@ -383,6 +383,41 @@ "y": 260.0, "frameIndex": 60, "tween": true + }, + { + "$type": "EditorCommon.JsonModel.Animation.TimeLinePointFrameSurrogate, EditorCommon", + "x": 601.0, + "y": 302.0, + "frameIndex": 70, + "tween": true + }, + { + "$type": "EditorCommon.JsonModel.Animation.TimeLinePointFrameSurrogate, EditorCommon", + "x": 601.0, + "y": 276.0, + "frameIndex": 90, + "tween": true + }, + { + "$type": "EditorCommon.JsonModel.Animation.TimeLinePointFrameSurrogate, EditorCommon", + "x": 601.0, + "y": 302.0, + "frameIndex": 100, + "tween": true + }, + { + "$type": "EditorCommon.JsonModel.Animation.TimeLinePointFrameSurrogate, EditorCommon", + "x": 601.0, + "y": 266.0, + "frameIndex": 120, + "tween": true + }, + { + "$type": "EditorCommon.JsonModel.Animation.TimeLinePointFrameSurrogate, EditorCommon", + "x": 601.0, + "y": 302.0, + "frameIndex": 130, + "tween": true } ] }, @@ -401,14 +436,14 @@ "$type": "EditorCommon.JsonModel.Animation.TimeLinePointFrameSurrogate, EditorCommon", "x": 1.0, "y": 1.0, - "frameIndex": 30, + "frameIndex": 60, "tween": true }, { "$type": "EditorCommon.JsonModel.Animation.TimeLinePointFrameSurrogate, EditorCommon", "x": 1.0, "y": 1.0, - "frameIndex": 60, + "frameIndex": 100, "tween": true } ] @@ -426,8 +461,8 @@ }, { "$type": "EditorCommon.JsonModel.Animation.TimeLinePointFrameSurrogate, EditorCommon", - "x": 0.9654804, - "y": 0.9654804, + "x": -0.9363089, + "y": -0.9363089, "frameIndex": 30, "tween": true }, @@ -437,6 +472,55 @@ "y": 0.0, "frameIndex": 60, "tween": true + }, + { + "$type": "EditorCommon.JsonModel.Animation.TimeLinePointFrameSurrogate, EditorCommon", + "x": 0.272187382, + "y": 0.272187382, + "frameIndex": 70, + "tween": true + }, + { + "$type": "EditorCommon.JsonModel.Animation.TimeLinePointFrameSurrogate, EditorCommon", + "x": -3.800404, + "y": -3.800404, + "frameIndex": 80, + "tween": true + }, + { + "$type": "EditorCommon.JsonModel.Animation.TimeLinePointFrameSurrogate, EditorCommon", + "x": -5.22106457, + "y": -5.22106457, + "frameIndex": 90, + "tween": true + }, + { + "$type": "EditorCommon.JsonModel.Animation.TimeLinePointFrameSurrogate, EditorCommon", + "x": 0.0, + "y": 0.0, + "frameIndex": 100, + "tween": true + }, + { + "$type": "EditorCommon.JsonModel.Animation.TimeLinePointFrameSurrogate, EditorCommon", + "x": 4.140224, + "y": 4.140224, + "frameIndex": 110, + "tween": true + }, + { + "$type": "EditorCommon.JsonModel.Animation.TimeLinePointFrameSurrogate, EditorCommon", + "x": 6.63524, + "y": 6.63524, + "frameIndex": 120, + "tween": true + }, + { + "$type": "EditorCommon.JsonModel.Animation.TimeLinePointFrameSurrogate, EditorCommon", + "x": 0.272187382, + "y": 0.272187382, + "frameIndex": 130, + "tween": true } ] }, @@ -446,24 +530,73 @@ "frames": [ { "$type": "EditorCommon.JsonModel.Animation.TimeLinePointFrameSurrogate, EditorCommon", - "x": 68.0, - "y": 138.0, + "x": 72.0, + "y": 143.0, "frameIndex": 0, "tween": true }, { "$type": "EditorCommon.JsonModel.Animation.TimeLinePointFrameSurrogate, EditorCommon", - "x": 68.0, - "y": 138.0, + "x": 74.0, + "y": 150.0, "frameIndex": 30, "tween": true }, { "$type": "EditorCommon.JsonModel.Animation.TimeLinePointFrameSurrogate, EditorCommon", - "x": 68.0, - "y": 138.0, + "x": 72.0, + "y": 143.0, "frameIndex": 60, "tween": true + }, + { + "$type": "EditorCommon.JsonModel.Animation.TimeLinePointFrameSurrogate, EditorCommon", + "x": 85.0, + "y": 143.0, + "frameIndex": 70, + "tween": true + }, + { + "$type": "EditorCommon.JsonModel.Animation.TimeLinePointFrameSurrogate, EditorCommon", + "x": 74.0, + "y": 133.0, + "frameIndex": 80, + "tween": true + }, + { + "$type": "EditorCommon.JsonModel.Animation.TimeLinePointFrameSurrogate, EditorCommon", + "x": 74.0, + "y": 133.0, + "frameIndex": 90, + "tween": true + }, + { + "$type": "EditorCommon.JsonModel.Animation.TimeLinePointFrameSurrogate, EditorCommon", + "x": 73.0, + "y": 135.0, + "frameIndex": 100, + "tween": true + }, + { + "$type": "EditorCommon.JsonModel.Animation.TimeLinePointFrameSurrogate, EditorCommon", + "x": 77.0, + "y": 136.0, + "frameIndex": 110, + "tween": true + }, + { + "$type": "EditorCommon.JsonModel.Animation.TimeLinePointFrameSurrogate, EditorCommon", + "x": 80.0, + "y": 141.0, + "frameIndex": 120, + "tween": true + }, + { + "$type": "EditorCommon.JsonModel.Animation.TimeLinePointFrameSurrogate, EditorCommon", + "x": 85.0, + "y": 143.0, + "frameIndex": 130, + "tween": true } ] }, @@ -482,14 +615,28 @@ "$type": "EditorCommon.JsonModel.Animation.TimeLinePointFrameSurrogate, EditorCommon", "x": 1.0, "y": 1.0, - "frameIndex": 30, + "frameIndex": 60, "tween": true }, { "$type": "EditorCommon.JsonModel.Animation.TimeLinePointFrameSurrogate, EditorCommon", "x": 1.0, "y": 1.0, - "frameIndex": 60, + "frameIndex": 80, + "tween": true + }, + { + "$type": "EditorCommon.JsonModel.Animation.TimeLinePointFrameSurrogate, EditorCommon", + "x": 1.0, + "y": 1.0, + "frameIndex": 90, + "tween": true + }, + { + "$type": "EditorCommon.JsonModel.Animation.TimeLinePointFrameSurrogate, EditorCommon", + "x": 1.0, + "y": 1.0, + "frameIndex": 100, "tween": true } ] @@ -507,8 +654,8 @@ }, { "$type": "EditorCommon.JsonModel.Animation.TimeLinePointFrameSurrogate, EditorCommon", - "x": 3.0, - "y": 3.0, + "x": -7.453563, + "y": -7.453563, "frameIndex": 30, "tween": true }, @@ -518,6 +665,55 @@ "y": 0.0, "frameIndex": 60, "tween": true + }, + { + "$type": "EditorCommon.JsonModel.Animation.TimeLinePointFrameSurrogate, EditorCommon", + "x": -45.5398178, + "y": -45.5398178, + "frameIndex": 70, + "tween": true + }, + { + "$type": "EditorCommon.JsonModel.Animation.TimeLinePointFrameSurrogate, EditorCommon", + "x": -32.180584, + "y": -32.180584, + "frameIndex": 80, + "tween": true + }, + { + "$type": "EditorCommon.JsonModel.Animation.TimeLinePointFrameSurrogate, EditorCommon", + "x": -15.1353874, + "y": -15.1353874, + "frameIndex": 90, + "tween": true + }, + { + "$type": "EditorCommon.JsonModel.Animation.TimeLinePointFrameSurrogate, EditorCommon", + "x": -28.6575718, + "y": -28.6575718, + "frameIndex": 100, + "tween": true + }, + { + "$type": "EditorCommon.JsonModel.Animation.TimeLinePointFrameSurrogate, EditorCommon", + "x": -53.086937, + "y": -53.086937, + "frameIndex": 110, + "tween": true + }, + { + "$type": "EditorCommon.JsonModel.Animation.TimeLinePointFrameSurrogate, EditorCommon", + "x": -84.56819, + "y": -84.56819, + "frameIndex": 120, + "tween": true + }, + { + "$type": "EditorCommon.JsonModel.Animation.TimeLinePointFrameSurrogate, EditorCommon", + "x": -45.5398178, + "y": -45.5398178, + "frameIndex": 130, + "tween": true } ] }, @@ -534,13 +730,37 @@ { "$type": "EditorCommon.JsonModel.Animation.TimeLineIntFrameSurrogate, EditorCommon", "value": -2, - "frameIndex": 30, + "frameIndex": 60, "tween": true }, { "$type": "EditorCommon.JsonModel.Animation.TimeLineIntFrameSurrogate, EditorCommon", "value": -2, - "frameIndex": 60, + "frameIndex": 70, + "tween": true + }, + { + "$type": "EditorCommon.JsonModel.Animation.TimeLineIntFrameSurrogate, EditorCommon", + "value": -2, + "frameIndex": 80, + "tween": true + }, + { + "$type": "EditorCommon.JsonModel.Animation.TimeLineIntFrameSurrogate, EditorCommon", + "value": -2, + "frameIndex": 90, + "tween": true + }, + { + "$type": "EditorCommon.JsonModel.Animation.TimeLineIntFrameSurrogate, EditorCommon", + "value": -2, + "frameIndex": 100, + "tween": true + }, + { + "$type": "EditorCommon.JsonModel.Animation.TimeLineIntFrameSurrogate, EditorCommon", + "value": -2, + "frameIndex": 130, "tween": true } ] @@ -551,24 +771,73 @@ "frames": [ { "$type": "EditorCommon.JsonModel.Animation.TimeLinePointFrameSurrogate, EditorCommon", - "x": 18.0, - "y": 21.0, + "x": 38.0, + "y": 20.0, "frameIndex": 0, "tween": true }, { "$type": "EditorCommon.JsonModel.Animation.TimeLinePointFrameSurrogate, EditorCommon", - "x": 18.0, - "y": 21.0, + "x": 30.0, + "y": 28.0, "frameIndex": 30, "tween": true }, { "$type": "EditorCommon.JsonModel.Animation.TimeLinePointFrameSurrogate, EditorCommon", - "x": 18.0, - "y": 21.0, + "x": 38.0, + "y": 20.0, "frameIndex": 60, "tween": true + }, + { + "$type": "EditorCommon.JsonModel.Animation.TimeLinePointFrameSurrogate, EditorCommon", + "x": 24.0, + "y": 46.0, + "frameIndex": 70, + "tween": true + }, + { + "$type": "EditorCommon.JsonModel.Animation.TimeLinePointFrameSurrogate, EditorCommon", + "x": 26.0, + "y": 39.0, + "frameIndex": 80, + "tween": true + }, + { + "$type": "EditorCommon.JsonModel.Animation.TimeLinePointFrameSurrogate, EditorCommon", + "x": 23.0, + "y": 35.0, + "frameIndex": 90, + "tween": true + }, + { + "$type": "EditorCommon.JsonModel.Animation.TimeLinePointFrameSurrogate, EditorCommon", + "x": 34.0, + "y": 34.0, + "frameIndex": 100, + "tween": true + }, + { + "$type": "EditorCommon.JsonModel.Animation.TimeLinePointFrameSurrogate, EditorCommon", + "x": 22.0, + "y": 43.0, + "frameIndex": 110, + "tween": true + }, + { + "$type": "EditorCommon.JsonModel.Animation.TimeLinePointFrameSurrogate, EditorCommon", + "x": 33.0, + "y": 33.0, + "frameIndex": 120, + "tween": true + }, + { + "$type": "EditorCommon.JsonModel.Animation.TimeLinePointFrameSurrogate, EditorCommon", + "x": 24.0, + "y": 46.0, + "frameIndex": 130, + "tween": true } ] }, @@ -587,14 +856,28 @@ "$type": "EditorCommon.JsonModel.Animation.TimeLinePointFrameSurrogate, EditorCommon", "x": 1.0, "y": 1.0, - "frameIndex": 30, + "frameIndex": 60, "tween": true }, { "$type": "EditorCommon.JsonModel.Animation.TimeLinePointFrameSurrogate, EditorCommon", "x": 1.0, "y": 1.0, - "frameIndex": 60, + "frameIndex": 80, + "tween": true + }, + { + "$type": "EditorCommon.JsonModel.Animation.TimeLinePointFrameSurrogate, EditorCommon", + "x": 1.0, + "y": 1.0, + "frameIndex": 90, + "tween": true + }, + { + "$type": "EditorCommon.JsonModel.Animation.TimeLinePointFrameSurrogate, EditorCommon", + "x": 1.0, + "y": 1.0, + "frameIndex": 100, "tween": true } ] @@ -612,8 +895,8 @@ }, { "$type": "EditorCommon.JsonModel.Animation.TimeLinePointFrameSurrogate, EditorCommon", - "x": 0.0, - "y": 0.0, + "x": -5.32836628, + "y": -5.32836628, "frameIndex": 30, "tween": true }, @@ -623,6 +906,55 @@ "y": 0.0, "frameIndex": 60, "tween": true + }, + { + "$type": "EditorCommon.JsonModel.Animation.TimeLinePointFrameSurrogate, EditorCommon", + "x": -76.14927, + "y": -76.14927, + "frameIndex": 70, + "tween": true + }, + { + "$type": "EditorCommon.JsonModel.Animation.TimeLinePointFrameSurrogate, EditorCommon", + "x": -79.7780762, + "y": -79.7780762, + "frameIndex": 80, + "tween": true + }, + { + "$type": "EditorCommon.JsonModel.Animation.TimeLinePointFrameSurrogate, EditorCommon", + "x": -86.0518951, + "y": -86.0518951, + "frameIndex": 90, + "tween": true + }, + { + "$type": "EditorCommon.JsonModel.Animation.TimeLinePointFrameSurrogate, EditorCommon", + "x": -88.36781, + "y": -88.36781, + "frameIndex": 100, + "tween": true + }, + { + "$type": "EditorCommon.JsonModel.Animation.TimeLinePointFrameSurrogate, EditorCommon", + "x": -66.165184, + "y": -66.165184, + "frameIndex": 110, + "tween": true + }, + { + "$type": "EditorCommon.JsonModel.Animation.TimeLinePointFrameSurrogate, EditorCommon", + "x": -39.37061, + "y": -39.37061, + "frameIndex": 120, + "tween": true + }, + { + "$type": "EditorCommon.JsonModel.Animation.TimeLinePointFrameSurrogate, EditorCommon", + "x": -76.14927, + "y": -76.14927, + "frameIndex": 130, + "tween": true } ] }, @@ -632,24 +964,73 @@ "frames": [ { "$type": "EditorCommon.JsonModel.Animation.TimeLinePointFrameSurrogate, EditorCommon", - "x": 145.0, - "y": 33.0, + "x": 144.0, + "y": 50.0, "frameIndex": 0, "tween": true }, { "$type": "EditorCommon.JsonModel.Animation.TimeLinePointFrameSurrogate, EditorCommon", - "x": 145.0, - "y": 33.0, + "x": 142.0, + "y": 59.0, "frameIndex": 30, "tween": true }, { "$type": "EditorCommon.JsonModel.Animation.TimeLinePointFrameSurrogate, EditorCommon", - "x": 145.0, - "y": 33.0, + "x": 144.0, + "y": 50.0, "frameIndex": 60, "tween": true + }, + { + "$type": "EditorCommon.JsonModel.Animation.TimeLinePointFrameSurrogate, EditorCommon", + "x": 202.0, + "y": 37.0, + "frameIndex": 70, + "tween": true + }, + { + "$type": "EditorCommon.JsonModel.Animation.TimeLinePointFrameSurrogate, EditorCommon", + "x": 194.0, + "y": 23.0, + "frameIndex": 80, + "tween": true + }, + { + "$type": "EditorCommon.JsonModel.Animation.TimeLinePointFrameSurrogate, EditorCommon", + "x": 203.0, + "y": 7.0, + "frameIndex": 90, + "tween": true + }, + { + "$type": "EditorCommon.JsonModel.Animation.TimeLinePointFrameSurrogate, EditorCommon", + "x": 177.0, + "y": 80.0, + "frameIndex": 100, + "tween": true + }, + { + "$type": "EditorCommon.JsonModel.Animation.TimeLinePointFrameSurrogate, EditorCommon", + "x": 137.0, + "y": 82.0, + "frameIndex": 110, + "tween": true + }, + { + "$type": "EditorCommon.JsonModel.Animation.TimeLinePointFrameSurrogate, EditorCommon", + "x": 125.0, + "y": 22.0, + "frameIndex": 120, + "tween": true + }, + { + "$type": "EditorCommon.JsonModel.Animation.TimeLinePointFrameSurrogate, EditorCommon", + "x": 202.0, + "y": 37.0, + "frameIndex": 130, + "tween": true } ] }, @@ -668,14 +1049,28 @@ "$type": "EditorCommon.JsonModel.Animation.TimeLinePointFrameSurrogate, EditorCommon", "x": 1.0, "y": 1.0, - "frameIndex": 30, + "frameIndex": 60, "tween": true }, { "$type": "EditorCommon.JsonModel.Animation.TimeLinePointFrameSurrogate, EditorCommon", "x": 1.0, "y": 1.0, - "frameIndex": 60, + "frameIndex": 80, + "tween": true + }, + { + "$type": "EditorCommon.JsonModel.Animation.TimeLinePointFrameSurrogate, EditorCommon", + "x": 1.0, + "y": 1.0, + "frameIndex": 90, + "tween": true + }, + { + "$type": "EditorCommon.JsonModel.Animation.TimeLinePointFrameSurrogate, EditorCommon", + "x": 1.0, + "y": 1.0, + "frameIndex": 100, "tween": true } ] @@ -693,16 +1088,58 @@ }, { "$type": "EditorCommon.JsonModel.Animation.TimeLinePointFrameSurrogate, EditorCommon", - "x": 6.43459034, - "y": 6.43459034, - "frameIndex": 30, + "x": 0.0, + "y": 0.0, + "frameIndex": 60, "tween": true }, { "$type": "EditorCommon.JsonModel.Animation.TimeLinePointFrameSurrogate, EditorCommon", - "x": 0.0, - "y": 0.0, - "frameIndex": 60, + "x": -30.4871216, + "y": -30.4871216, + "frameIndex": 70, + "tween": true + }, + { + "$type": "EditorCommon.JsonModel.Animation.TimeLinePointFrameSurrogate, EditorCommon", + "x": -55.49503, + "y": -55.49503, + "frameIndex": 80, + "tween": true + }, + { + "$type": "EditorCommon.JsonModel.Animation.TimeLinePointFrameSurrogate, EditorCommon", + "x": -65.75558, + "y": -65.75558, + "frameIndex": 90, + "tween": true + }, + { + "$type": "EditorCommon.JsonModel.Animation.TimeLinePointFrameSurrogate, EditorCommon", + "x": -39.3511925, + "y": -39.3511925, + "frameIndex": 100, + "tween": true + }, + { + "$type": "EditorCommon.JsonModel.Animation.TimeLinePointFrameSurrogate, EditorCommon", + "x": -3.07847571, + "y": -3.07847571, + "frameIndex": 110, + "tween": true + }, + { + "$type": "EditorCommon.JsonModel.Animation.TimeLinePointFrameSurrogate, EditorCommon", + "x": 12.323699, + "y": 12.323699, + "frameIndex": 120, + "tween": true + }, + { + "$type": "EditorCommon.JsonModel.Animation.TimeLinePointFrameSurrogate, EditorCommon", + "x": -30.4871216, + "y": -30.4871216, + "frameIndex": 130, "tween": true } ] @@ -716,12 +1153,6 @@ "value": -2, "frameIndex": 0, "tween": true - }, - { - "$type": "EditorCommon.JsonModel.Animation.TimeLineIntFrameSurrogate, EditorCommon", - "value": -2, - "frameIndex": 60, - "tween": true } ] }, @@ -731,24 +1162,73 @@ "frames": [ { "$type": "EditorCommon.JsonModel.Animation.TimeLinePointFrameSurrogate, EditorCommon", - "x": 66.0, - "y": 1.0, + "x": 60.0, + "y": -5.0, "frameIndex": 0, "tween": true }, { "$type": "EditorCommon.JsonModel.Animation.TimeLinePointFrameSurrogate, EditorCommon", - "x": 66.0, - "y": 1.0, + "x": 58.0, + "y": 8.0, "frameIndex": 30, "tween": true }, { "$type": "EditorCommon.JsonModel.Animation.TimeLinePointFrameSurrogate, EditorCommon", - "x": 66.0, - "y": 1.0, + "x": 60.0, + "y": -5.0, "frameIndex": 60, "tween": true + }, + { + "$type": "EditorCommon.JsonModel.Animation.TimeLinePointFrameSurrogate, EditorCommon", + "x": 44.0, + "y": -10.0, + "frameIndex": 70, + "tween": true + }, + { + "$type": "EditorCommon.JsonModel.Animation.TimeLinePointFrameSurrogate, EditorCommon", + "x": 36.0, + "y": 10.0, + "frameIndex": 80, + "tween": true + }, + { + "$type": "EditorCommon.JsonModel.Animation.TimeLinePointFrameSurrogate, EditorCommon", + "x": 42.0, + "y": 8.0, + "frameIndex": 90, + "tween": true + }, + { + "$type": "EditorCommon.JsonModel.Animation.TimeLinePointFrameSurrogate, EditorCommon", + "x": 63.0, + "y": 5.0, + "frameIndex": 100, + "tween": true + }, + { + "$type": "EditorCommon.JsonModel.Animation.TimeLinePointFrameSurrogate, EditorCommon", + "x": 79.0, + "y": 2.0, + "frameIndex": 110, + "tween": true + }, + { + "$type": "EditorCommon.JsonModel.Animation.TimeLinePointFrameSurrogate, EditorCommon", + "x": 77.0, + "y": -12.0, + "frameIndex": 120, + "tween": true + }, + { + "$type": "EditorCommon.JsonModel.Animation.TimeLinePointFrameSurrogate, EditorCommon", + "x": 44.0, + "y": -10.0, + "frameIndex": 130, + "tween": true } ] }, @@ -776,6 +1256,27 @@ "y": 1.0, "frameIndex": 60, "tween": true + }, + { + "$type": "EditorCommon.JsonModel.Animation.TimeLinePointFrameSurrogate, EditorCommon", + "x": 1.0, + "y": 1.0, + "frameIndex": 80, + "tween": true + }, + { + "$type": "EditorCommon.JsonModel.Animation.TimeLinePointFrameSurrogate, EditorCommon", + "x": 1.0, + "y": 1.0, + "frameIndex": 90, + "tween": true + }, + { + "$type": "EditorCommon.JsonModel.Animation.TimeLinePointFrameSurrogate, EditorCommon", + "x": 1.0, + "y": 1.0, + "frameIndex": 100, + "tween": true } ] }, @@ -792,8 +1293,8 @@ }, { "$type": "EditorCommon.JsonModel.Animation.TimeLinePointFrameSurrogate, EditorCommon", - "x": -7.849513, - "y": -7.849513, + "x": -1.48815751, + "y": -1.48815751, "frameIndex": 30, "tween": true }, @@ -803,6 +1304,55 @@ "y": 0.0, "frameIndex": 60, "tween": true + }, + { + "$type": "EditorCommon.JsonModel.Animation.TimeLinePointFrameSurrogate, EditorCommon", + "x": 12.4439116, + "y": 12.4439116, + "frameIndex": 70, + "tween": true + }, + { + "$type": "EditorCommon.JsonModel.Animation.TimeLinePointFrameSurrogate, EditorCommon", + "x": 27.2269726, + "y": 27.2269726, + "frameIndex": 80, + "tween": true + }, + { + "$type": "EditorCommon.JsonModel.Animation.TimeLinePointFrameSurrogate, EditorCommon", + "x": 35.7791862, + "y": 35.7791862, + "frameIndex": 90, + "tween": true + }, + { + "$type": "EditorCommon.JsonModel.Animation.TimeLinePointFrameSurrogate, EditorCommon", + "x": 0.3896717, + "y": 0.3896717, + "frameIndex": 100, + "tween": true + }, + { + "$type": "EditorCommon.JsonModel.Animation.TimeLinePointFrameSurrogate, EditorCommon", + "x": -19.0932655, + "y": -19.0932655, + "frameIndex": 110, + "tween": true + }, + { + "$type": "EditorCommon.JsonModel.Animation.TimeLinePointFrameSurrogate, EditorCommon", + "x": -11.7843628, + "y": -11.7843628, + "frameIndex": 120, + "tween": true + }, + { + "$type": "EditorCommon.JsonModel.Animation.TimeLinePointFrameSurrogate, EditorCommon", + "x": 12.4439116, + "y": 12.4439116, + "frameIndex": 130, + "tween": true } ] }, @@ -812,24 +1362,73 @@ "frames": [ { "$type": "EditorCommon.JsonModel.Animation.TimeLinePointFrameSurrogate, EditorCommon", - "x": 200.0, - "y": 27.0, + "x": 196.0, + "y": 44.0, "frameIndex": 0, "tween": true }, { "$type": "EditorCommon.JsonModel.Animation.TimeLinePointFrameSurrogate, EditorCommon", - "x": 200.0, - "y": 27.0, + "x": 194.0, + "y": 53.0, "frameIndex": 30, "tween": true }, { "$type": "EditorCommon.JsonModel.Animation.TimeLinePointFrameSurrogate, EditorCommon", - "x": 200.0, - "y": 27.0, + "x": 196.0, + "y": 44.0, "frameIndex": 60, "tween": true + }, + { + "$type": "EditorCommon.JsonModel.Animation.TimeLinePointFrameSurrogate, EditorCommon", + "x": 167.0, + "y": 31.0, + "frameIndex": 70, + "tween": true + }, + { + "$type": "EditorCommon.JsonModel.Animation.TimeLinePointFrameSurrogate, EditorCommon", + "x": 146.0, + "y": 8.0, + "frameIndex": 80, + "tween": true + }, + { + "$type": "EditorCommon.JsonModel.Animation.TimeLinePointFrameSurrogate, EditorCommon", + "x": 112.0, + "y": -6.0, + "frameIndex": 90, + "tween": true + }, + { + "$type": "EditorCommon.JsonModel.Animation.TimeLinePointFrameSurrogate, EditorCommon", + "x": 143.0, + "y": 10.0, + "frameIndex": 100, + "tween": true + }, + { + "$type": "EditorCommon.JsonModel.Animation.TimeLinePointFrameSurrogate, EditorCommon", + "x": 202.0, + "y": 32.0, + "frameIndex": 110, + "tween": true + }, + { + "$type": "EditorCommon.JsonModel.Animation.TimeLinePointFrameSurrogate, EditorCommon", + "x": 194.0, + "y": 28.0, + "frameIndex": 120, + "tween": true + }, + { + "$type": "EditorCommon.JsonModel.Animation.TimeLinePointFrameSurrogate, EditorCommon", + "x": 167.0, + "y": 31.0, + "frameIndex": 130, + "tween": true } ] }, @@ -848,14 +1447,28 @@ "$type": "EditorCommon.JsonModel.Animation.TimeLinePointFrameSurrogate, EditorCommon", "x": 1.0, "y": 1.0, - "frameIndex": 30, + "frameIndex": 60, "tween": true }, { "$type": "EditorCommon.JsonModel.Animation.TimeLinePointFrameSurrogate, EditorCommon", "x": 1.0, "y": 1.0, - "frameIndex": 60, + "frameIndex": 80, + "tween": true + }, + { + "$type": "EditorCommon.JsonModel.Animation.TimeLinePointFrameSurrogate, EditorCommon", + "x": 1.0, + "y": 1.0, + "frameIndex": 90, + "tween": true + }, + { + "$type": "EditorCommon.JsonModel.Animation.TimeLinePointFrameSurrogate, EditorCommon", + "x": 1.0, + "y": 1.0, + "frameIndex": 100, "tween": true } ] @@ -873,16 +1486,58 @@ }, { "$type": "EditorCommon.JsonModel.Animation.TimeLinePointFrameSurrogate, EditorCommon", - "x": 5.65789843, - "y": 5.65789843, - "frameIndex": 30, + "x": 0.0, + "y": 0.0, + "frameIndex": 60, "tween": true }, { "$type": "EditorCommon.JsonModel.Animation.TimeLinePointFrameSurrogate, EditorCommon", - "x": 0.0, - "y": 0.0, - "frameIndex": 60, + "x": 23.2254734, + "y": 23.2254734, + "frameIndex": 70, + "tween": true + }, + { + "$type": "EditorCommon.JsonModel.Animation.TimeLinePointFrameSurrogate, EditorCommon", + "x": 61.1631927, + "y": 61.1631927, + "frameIndex": 80, + "tween": true + }, + { + "$type": "EditorCommon.JsonModel.Animation.TimeLinePointFrameSurrogate, EditorCommon", + "x": 58.3439522, + "y": 58.3439522, + "frameIndex": 90, + "tween": true + }, + { + "$type": "EditorCommon.JsonModel.Animation.TimeLinePointFrameSurrogate, EditorCommon", + "x": 25.947691, + "y": 25.947691, + "frameIndex": 100, + "tween": true + }, + { + "$type": "EditorCommon.JsonModel.Animation.TimeLinePointFrameSurrogate, EditorCommon", + "x": -2.07755661, + "y": -2.07755661, + "frameIndex": 110, + "tween": true + }, + { + "$type": "EditorCommon.JsonModel.Animation.TimeLinePointFrameSurrogate, EditorCommon", + "x": -23.33069, + "y": -23.33069, + "frameIndex": 120, + "tween": true + }, + { + "$type": "EditorCommon.JsonModel.Animation.TimeLinePointFrameSurrogate, EditorCommon", + "x": 23.2254734, + "y": 23.2254734, + "frameIndex": 130, "tween": true } ] @@ -893,24 +1548,73 @@ "frames": [ { "$type": "EditorCommon.JsonModel.Animation.TimeLinePointFrameSurrogate, EditorCommon", - "x": 155.0, - "y": 16.0, + "x": 164.0, + "y": 9.0, "frameIndex": 0, "tween": true }, { "$type": "EditorCommon.JsonModel.Animation.TimeLinePointFrameSurrogate, EditorCommon", - "x": 155.0, - "y": 16.0, + "x": 166.0, + "y": 14.0, "frameIndex": 30, "tween": true }, { "$type": "EditorCommon.JsonModel.Animation.TimeLinePointFrameSurrogate, EditorCommon", - "x": 155.0, - "y": 16.0, + "x": 164.0, + "y": 9.0, "frameIndex": 60, "tween": true + }, + { + "$type": "EditorCommon.JsonModel.Animation.TimeLinePointFrameSurrogate, EditorCommon", + "x": 167.0, + "y": 41.0, + "frameIndex": 70, + "tween": true + }, + { + "$type": "EditorCommon.JsonModel.Animation.TimeLinePointFrameSurrogate, EditorCommon", + "x": 153.0, + "y": 49.0, + "frameIndex": 80, + "tween": true + }, + { + "$type": "EditorCommon.JsonModel.Animation.TimeLinePointFrameSurrogate, EditorCommon", + "x": 157.0, + "y": 44.0, + "frameIndex": 90, + "tween": true + }, + { + "$type": "EditorCommon.JsonModel.Animation.TimeLinePointFrameSurrogate, EditorCommon", + "x": 162.0, + "y": 19.0, + "frameIndex": 100, + "tween": true + }, + { + "$type": "EditorCommon.JsonModel.Animation.TimeLinePointFrameSurrogate, EditorCommon", + "x": 163.0, + "y": 15.0, + "frameIndex": 110, + "tween": true + }, + { + "$type": "EditorCommon.JsonModel.Animation.TimeLinePointFrameSurrogate, EditorCommon", + "x": 156.0, + "y": 13.0, + "frameIndex": 120, + "tween": true + }, + { + "$type": "EditorCommon.JsonModel.Animation.TimeLinePointFrameSurrogate, EditorCommon", + "x": 167.0, + "y": 41.0, + "frameIndex": 130, + "tween": true } ] }, @@ -938,6 +1642,27 @@ "y": 1.0, "frameIndex": 60, "tween": true + }, + { + "$type": "EditorCommon.JsonModel.Animation.TimeLinePointFrameSurrogate, EditorCommon", + "x": 1.0, + "y": 1.0, + "frameIndex": 80, + "tween": true + }, + { + "$type": "EditorCommon.JsonModel.Animation.TimeLinePointFrameSurrogate, EditorCommon", + "x": 1.0, + "y": 1.0, + "frameIndex": 90, + "tween": true + }, + { + "$type": "EditorCommon.JsonModel.Animation.TimeLinePointFrameSurrogate, EditorCommon", + "x": 1.0, + "y": 1.0, + "frameIndex": 100, + "tween": true } ] }, @@ -954,8 +1679,8 @@ }, { "$type": "EditorCommon.JsonModel.Animation.TimeLinePointFrameSurrogate, EditorCommon", - "x": -14.9207821, - "y": -14.9207821, + "x": 2.614448, + "y": 2.614448, "frameIndex": 30, "tween": true }, @@ -965,6 +1690,55 @@ "y": 0.0, "frameIndex": 60, "tween": true + }, + { + "$type": "EditorCommon.JsonModel.Animation.TimeLinePointFrameSurrogate, EditorCommon", + "x": -47.04919, + "y": -47.04919, + "frameIndex": 70, + "tween": true + }, + { + "$type": "EditorCommon.JsonModel.Animation.TimeLinePointFrameSurrogate, EditorCommon", + "x": -62.07396, + "y": -62.07396, + "frameIndex": 80, + "tween": true + }, + { + "$type": "EditorCommon.JsonModel.Animation.TimeLinePointFrameSurrogate, EditorCommon", + "x": -33.3642273, + "y": -33.3642273, + "frameIndex": 90, + "tween": true + }, + { + "$type": "EditorCommon.JsonModel.Animation.TimeLinePointFrameSurrogate, EditorCommon", + "x": -25.57315, + "y": -25.57315, + "frameIndex": 100, + "tween": true + }, + { + "$type": "EditorCommon.JsonModel.Animation.TimeLinePointFrameSurrogate, EditorCommon", + "x": -19.1204987, + "y": -19.1204987, + "frameIndex": 110, + "tween": true + }, + { + "$type": "EditorCommon.JsonModel.Animation.TimeLinePointFrameSurrogate, EditorCommon", + "x": -4.30311966, + "y": -4.30311966, + "frameIndex": 120, + "tween": true + }, + { + "$type": "EditorCommon.JsonModel.Animation.TimeLinePointFrameSurrogate, EditorCommon", + "x": -47.04919, + "y": -47.04919, + "frameIndex": 130, + "tween": true } ] }, @@ -974,24 +1748,73 @@ "frames": [ { "$type": "EditorCommon.JsonModel.Animation.TimeLinePointFrameSurrogate, EditorCommon", - "x": 134.0, - "y": 308.0, + "x": 137.0, + "y": 301.0, "frameIndex": 0, "tween": true }, { "$type": "EditorCommon.JsonModel.Animation.TimeLinePointFrameSurrogate, EditorCommon", - "x": 134.0, - "y": 308.0, + "x": 143.0, + "y": 297.0, "frameIndex": 30, "tween": true }, { "$type": "EditorCommon.JsonModel.Animation.TimeLinePointFrameSurrogate, EditorCommon", - "x": 134.0, - "y": 308.0, + "x": 137.0, + "y": 301.0, "frameIndex": 60, "tween": true + }, + { + "$type": "EditorCommon.JsonModel.Animation.TimeLinePointFrameSurrogate, EditorCommon", + "x": 146.0, + "y": 289.0, + "frameIndex": 70, + "tween": true + }, + { + "$type": "EditorCommon.JsonModel.Animation.TimeLinePointFrameSurrogate, EditorCommon", + "x": 149.0, + "y": 290.0, + "frameIndex": 80, + "tween": true + }, + { + "$type": "EditorCommon.JsonModel.Animation.TimeLinePointFrameSurrogate, EditorCommon", + "x": 146.0, + "y": 287.0, + "frameIndex": 90, + "tween": true + }, + { + "$type": "EditorCommon.JsonModel.Animation.TimeLinePointFrameSurrogate, EditorCommon", + "x": 148.0, + "y": 289.0, + "frameIndex": 100, + "tween": true + }, + { + "$type": "EditorCommon.JsonModel.Animation.TimeLinePointFrameSurrogate, EditorCommon", + "x": 147.0, + "y": 290.0, + "frameIndex": 110, + "tween": true + }, + { + "$type": "EditorCommon.JsonModel.Animation.TimeLinePointFrameSurrogate, EditorCommon", + "x": 148.0, + "y": 291.0, + "frameIndex": 120, + "tween": true + }, + { + "$type": "EditorCommon.JsonModel.Animation.TimeLinePointFrameSurrogate, EditorCommon", + "x": 146.0, + "y": 289.0, + "frameIndex": 130, + "tween": true } ] }, @@ -1010,14 +1833,28 @@ "$type": "EditorCommon.JsonModel.Animation.TimeLinePointFrameSurrogate, EditorCommon", "x": 1.0, "y": 1.0, - "frameIndex": 30, + "frameIndex": 60, "tween": true }, { "$type": "EditorCommon.JsonModel.Animation.TimeLinePointFrameSurrogate, EditorCommon", "x": 1.0, "y": 1.0, - "frameIndex": 60, + "frameIndex": 80, + "tween": true + }, + { + "$type": "EditorCommon.JsonModel.Animation.TimeLinePointFrameSurrogate, EditorCommon", + "x": 1.0, + "y": 1.0, + "frameIndex": 90, + "tween": true + }, + { + "$type": "EditorCommon.JsonModel.Animation.TimeLinePointFrameSurrogate, EditorCommon", + "x": 1.0, + "y": 1.0, + "frameIndex": 100, "tween": true } ] @@ -1035,8 +1872,8 @@ }, { "$type": "EditorCommon.JsonModel.Animation.TimeLinePointFrameSurrogate, EditorCommon", - "x": 0.0, - "y": 0.0, + "x": 6.1498704, + "y": 6.1498704, "frameIndex": 30, "tween": true }, @@ -1046,6 +1883,41 @@ "y": 0.0, "frameIndex": 60, "tween": true + }, + { + "$type": "EditorCommon.JsonModel.Animation.TimeLinePointFrameSurrogate, EditorCommon", + "x": 11.1060257, + "y": 11.1060257, + "frameIndex": 70, + "tween": true + }, + { + "$type": "EditorCommon.JsonModel.Animation.TimeLinePointFrameSurrogate, EditorCommon", + "x": 11.1060257, + "y": 11.1060257, + "frameIndex": 80, + "tween": true + }, + { + "$type": "EditorCommon.JsonModel.Animation.TimeLinePointFrameSurrogate, EditorCommon", + "x": 11.1060257, + "y": 11.1060257, + "frameIndex": 90, + "tween": true + }, + { + "$type": "EditorCommon.JsonModel.Animation.TimeLinePointFrameSurrogate, EditorCommon", + "x": 11.1060257, + "y": 11.1060257, + "frameIndex": 100, + "tween": true + }, + { + "$type": "EditorCommon.JsonModel.Animation.TimeLinePointFrameSurrogate, EditorCommon", + "x": 11.1060257, + "y": 11.1060257, + "frameIndex": 130, + "tween": true } ] }, @@ -1055,24 +1927,73 @@ "frames": [ { "$type": "EditorCommon.JsonModel.Animation.TimeLinePointFrameSurrogate, EditorCommon", - "x": 279.0, - "y": 144.0, + "x": 282.0, + "y": 152.0, "frameIndex": 0, "tween": true }, { "$type": "EditorCommon.JsonModel.Animation.TimeLinePointFrameSurrogate, EditorCommon", - "x": 279.0, - "y": 144.0, + "x": 280.0, + "y": 148.0, "frameIndex": 30, "tween": true }, { "$type": "EditorCommon.JsonModel.Animation.TimeLinePointFrameSurrogate, EditorCommon", - "x": 279.0, - "y": 144.0, + "x": 282.0, + "y": 152.0, "frameIndex": 60, "tween": true + }, + { + "$type": "EditorCommon.JsonModel.Animation.TimeLinePointFrameSurrogate, EditorCommon", + "x": 287.0, + "y": 153.0, + "frameIndex": 70, + "tween": true + }, + { + "$type": "EditorCommon.JsonModel.Animation.TimeLinePointFrameSurrogate, EditorCommon", + "x": 277.0, + "y": 144.0, + "frameIndex": 80, + "tween": true + }, + { + "$type": "EditorCommon.JsonModel.Animation.TimeLinePointFrameSurrogate, EditorCommon", + "x": 274.0, + "y": 135.0, + "frameIndex": 90, + "tween": true + }, + { + "$type": "EditorCommon.JsonModel.Animation.TimeLinePointFrameSurrogate, EditorCommon", + "x": 279.0, + "y": 147.0, + "frameIndex": 100, + "tween": true + }, + { + "$type": "EditorCommon.JsonModel.Animation.TimeLinePointFrameSurrogate, EditorCommon", + "x": 281.0, + "y": 153.0, + "frameIndex": 110, + "tween": true + }, + { + "$type": "EditorCommon.JsonModel.Animation.TimeLinePointFrameSurrogate, EditorCommon", + "x": 288.0, + "y": 149.0, + "frameIndex": 120, + "tween": true + }, + { + "$type": "EditorCommon.JsonModel.Animation.TimeLinePointFrameSurrogate, EditorCommon", + "x": 287.0, + "y": 153.0, + "frameIndex": 130, + "tween": true } ] }, @@ -1100,6 +2021,27 @@ "y": 1.0, "frameIndex": 60, "tween": true + }, + { + "$type": "EditorCommon.JsonModel.Animation.TimeLinePointFrameSurrogate, EditorCommon", + "x": 1.0, + "y": 1.0, + "frameIndex": 80, + "tween": true + }, + { + "$type": "EditorCommon.JsonModel.Animation.TimeLinePointFrameSurrogate, EditorCommon", + "x": 1.0, + "y": 1.0, + "frameIndex": 90, + "tween": true + }, + { + "$type": "EditorCommon.JsonModel.Animation.TimeLinePointFrameSurrogate, EditorCommon", + "x": 1.0, + "y": 1.0, + "frameIndex": 100, + "tween": true } ] }, @@ -1116,8 +2058,8 @@ }, { "$type": "EditorCommon.JsonModel.Animation.TimeLinePointFrameSurrogate, EditorCommon", - "x": 8.991114, - "y": 8.991114, + "x": 0.0, + "y": 0.0, "frameIndex": 30, "tween": true }, @@ -1127,6 +2069,55 @@ "y": 0.0, "frameIndex": 60, "tween": true + }, + { + "$type": "EditorCommon.JsonModel.Animation.TimeLinePointFrameSurrogate, EditorCommon", + "x": 20.6256847, + "y": 20.6256847, + "frameIndex": 70, + "tween": true + }, + { + "$type": "EditorCommon.JsonModel.Animation.TimeLinePointFrameSurrogate, EditorCommon", + "x": -8.132871, + "y": -8.132871, + "frameIndex": 80, + "tween": true + }, + { + "$type": "EditorCommon.JsonModel.Animation.TimeLinePointFrameSurrogate, EditorCommon", + "x": -17.91947, + "y": -17.91947, + "frameIndex": 90, + "tween": true + }, + { + "$type": "EditorCommon.JsonModel.Animation.TimeLinePointFrameSurrogate, EditorCommon", + "x": 3.91054678, + "y": 3.91054678, + "frameIndex": 100, + "tween": true + }, + { + "$type": "EditorCommon.JsonModel.Animation.TimeLinePointFrameSurrogate, EditorCommon", + "x": 15.3684883, + "y": 15.3684883, + "frameIndex": 110, + "tween": true + }, + { + "$type": "EditorCommon.JsonModel.Animation.TimeLinePointFrameSurrogate, EditorCommon", + "x": 34.9562759, + "y": 34.9562759, + "frameIndex": 120, + "tween": true + }, + { + "$type": "EditorCommon.JsonModel.Animation.TimeLinePointFrameSurrogate, EditorCommon", + "x": 20.6256847, + "y": 20.6256847, + "frameIndex": 130, + "tween": true } ] }