Skip to content

X
xiaoxiaole
Commit 24df9bcf authored by wjf's avatar wjf
Browse files
Options

l

parent 6431ca54
Show whitespace changes
Inline Side-by-side
Showing with 0 additions and 3 deletions
egret/src/mainScene/MainScene.ts
View file @ 24df9bcf
...@@ -51,12 +51,9 @@ import { GuideMsg } from '../something/uis/GuideMsg'; ...@@ -51,12 +51,9 @@ import { GuideMsg } from '../something/uis/GuideMsg';
import { readCache, getCacheKey } from '../mapScene/GuideCon'; import { readCache, getCacheKey } from '../mapScene/GuideCon';
import { PropGuideInt } from './PropGuide'; import { PropGuideInt } from './PropGuide';
import { StepAni } from '../something/anis/StepAni'; import { StepAni } from '../something/anis/StepAni';
<<<<<<< HEAD
import { updateMainTimerAfterGetData } from '../../libs/new_wx/MainBase'; import { updateMainTimerAfterGetData } from '../../libs/new_wx/MainBase';
import wait from '../../libs/new_tc/wait'; import wait from '../../libs/new_tc/wait';
=======
import { GameGuide } from './GameGuide'; import { GameGuide } from './GameGuide';
>>>>>>> edc2166bb8da76159df10a9a2edcbcb0c9506091
// tslint:disable: no-var-keyword // tslint:disable: no-var-keyword
// tslint:disable: prefer-const // tslint:disable: prefer-const
// tslint:disable: cyclomatic-complexity // tslint:disable: cyclomatic-complexity
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment