Skip to content

B
babycare_xiaoxiao
Commit 6aa55c2b authored by haiyoucuv's avatar haiyoucuv
Browse files
Options

换了点皮

parent d15234e8
Show whitespace changes
Inline Side-by-side
Showing with 13 additions and 93 deletions
.idea/workspace.xml
View file @ 6aa55c2b
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ChangeListManager">
<list default="true" id="9cef0552-af3c-4a1c-be1f-dc41ebe5b6db" name="Default Changelist" comment="">
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/common/ele0.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/common/ele0.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/common/ele1.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/common/ele1.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/common/ele10.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/common/ele10.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/common/ele11.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/common/ele11.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/common/ele12.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/common/ele12.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/common/ele2.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/common/ele2.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/common/ele3.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/common/ele3.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/common/ele4.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/common/ele4.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/common/ele5.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/common/ele5.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/common/ele6.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/common/ele6.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/common/ele8.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/common/ele8.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele0_0.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele0_0.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele0_1.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele0_1.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele0_10.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele0_10.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele0_11.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele0_11.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele0_12.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele0_12.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele0_13.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele0_13.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele0_14.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele0_14.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele0_2.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele0_2.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele0_3.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele0_3.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele0_4.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele0_4.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele0_5.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele0_5.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele0_6.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele0_6.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele0_7.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele0_7.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele0_8.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele0_8.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele0_9.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele0_9.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele1_0.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele1_0.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele1_1.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele1_1.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele1_10.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele1_10.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele1_11.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele1_11.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele1_12.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele1_12.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele1_13.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele1_13.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele1_14.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele1_14.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele1_2.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele1_2.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele1_3.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele1_3.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele1_4.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele1_4.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele1_5.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele1_5.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele1_6.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele1_6.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele1_7.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele1_7.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele1_8.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele1_8.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele1_9.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele1_9.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele3_.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/hor_ele0_0.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/fiveVerHorDis/hor_ele0_0.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/hor_ele0_1.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/fiveVerHorDis/hor_ele0_1.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/hor_ele0_10.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/fiveVerHorDis/hor_ele0_10.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/hor_ele0_11.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/fiveVerHorDis/hor_ele0_11.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/hor_ele0_12.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/fiveVerHorDis/hor_ele0_12.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/hor_ele0_13.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/fiveVerHorDis/hor_ele0_13.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/hor_ele0_14.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/fiveVerHorDis/hor_ele0_14.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/hor_ele0_15.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/fiveVerHorDis/hor_ele0_15.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/hor_ele0_2.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/fiveVerHorDis/hor_ele0_2.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/hor_ele0_3.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/fiveVerHorDis/hor_ele0_3.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/hor_ele0_4.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/fiveVerHorDis/hor_ele0_4.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/hor_ele0_5.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/fiveVerHorDis/hor_ele0_5.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/hor_ele0_6.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/fiveVerHorDis/hor_ele0_6.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/hor_ele0_7.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/fiveVerHorDis/hor_ele0_7.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/hor_ele0_8.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/fiveVerHorDis/hor_ele0_8.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/hor_ele0_9.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/fiveVerHorDis/hor_ele0_9.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/hor_ele4_0.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/fiveVerHorDis/hor_ele4_0.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/hor_ele4_1.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/fiveVerHorDis/hor_ele4_1.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/hor_ele4_10.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/fiveVerHorDis/hor_ele4_10.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/hor_ele4_11.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/fiveVerHorDis/hor_ele4_11.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/hor_ele4_12.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/fiveVerHorDis/hor_ele4_12.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/hor_ele4_13.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/fiveVerHorDis/hor_ele4_13.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/hor_ele4_14.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/fiveVerHorDis/hor_ele4_14.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/hor_ele4_15.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/fiveVerHorDis/hor_ele4_15.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/hor_ele4_2.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/fiveVerHorDis/hor_ele4_2.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/hor_ele4_3.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/fiveVerHorDis/hor_ele4_3.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/hor_ele4_4.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/fiveVerHorDis/hor_ele4_4.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/hor_ele4_5.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/fiveVerHorDis/hor_ele4_5.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/hor_ele4_6.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/fiveVerHorDis/hor_ele4_6.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/hor_ele4_7.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/fiveVerHorDis/hor_ele4_7.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/hor_ele4_8.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/fiveVerHorDis/hor_ele4_8.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/hor_ele4_9.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/fiveVerHorDis/hor_ele4_9.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/playScene/eggStatus0.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/playScene/eggStatus0.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/playScene/eggStatus1.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/playScene/eggStatus1.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/playScene/eggStatus2.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/playScene/eggStatus2.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/playScene/ele0Exp.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/playScene/ele0Exp.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/playScene/ele1Exp.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/playScene/ele1Exp.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/playScene/ele2Exp.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/playScene/ele2Exp.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/playScene/ele3Exp.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/playScene/ele3Exp.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/playScene/ele4Exp.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/playScene/ele4Exp.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/res.json" beforeDir="false" afterPath="$PROJECT_DIR$/resource/res.json" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/ResJson.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/ResJson.ts" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/something/uis/PropBtnCon.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/something/uis/PropBtnCon.ts" afterDir="false" />
</list>
<list default="true" id="9cef0552-af3c-4a1c-be1f-dc41ebe5b6db" name="Default Changelist" comment="" />
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
......@@ -529,7 +442,14 @@
<option name="project" value="LOCAL" />
<updated>1600841292605</updated>
</task>
<option name="localTasksCounter" value="45" />
<task id="LOCAL-00045" summary="换了点皮">
<created>1600860005659</created>
<option name="number" value="00045" />
<option name="presentableId" value="LOCAL-00045" />
<option name="project" value="LOCAL" />
<updated>1600860005659</updated>
</task>
<option name="localTasksCounter" value="46" />
<servers />
</component>
<component name="TypeScriptGeneratedFilesManager">
......@@ -560,10 +480,10 @@
<screen x="31" y="23" width="1889" height="1177" />
</state>
<state x="251" y="471" key="ANALYSIS_DLG_com.intellij.analysis.BaseAnalysisAction$1/31.23.1889.1177@31.23.1889.1177" timestamp="1594113080922" />
<state x="557" y="183" width="884" height="891" key="CommitChangelistDialog2" timestamp="1600841292338">
<state x="557" y="183" width="884" height="891" key="CommitChangelistDialog2" timestamp="1600860005131">
<screen x="30" y="23" width="1890" height="1177" />
</state>
<state x="557" y="183" key="CommitChangelistDialog2/30.23.1890.1177@30.23.1890.1177" timestamp="1600841292338" />
<state x="557" y="183" key="CommitChangelistDialog2/30.23.1890.1177@30.23.1890.1177" timestamp="1600860005131" />
<state x="558" y="183" width="884" height="891" key="CommitChangelistDialog2/31.23.1889.1177@31.23.1889.1177" timestamp="1595584297912" />
<state x="131" y="123" width="730" height="977" key="DiffContextDialog" timestamp="1596165868169">
<screen x="30" y="23" width="1890" height="1177" />
......@@ -611,10 +531,10 @@
</state>
<state x="289" y="314" key="SettingsEditor/30.23.1890.1177@30.23.1890.1177" timestamp="1596079390860" />
<state x="300" y="248" key="SettingsEditor/31.23.1889.1177@31.23.1889.1177" timestamp="1594798992724" />
<state x="91" y="351" key="Vcs.Push.Dialog.v2" timestamp="1600841294124">
<state x="91" y="351" key="Vcs.Push.Dialog.v2" timestamp="1600860006889">
<screen x="30" y="23" width="1890" height="1177" />
</state>
<state x="91" y="351" key="Vcs.Push.Dialog.v2/30.23.1890.1177@30.23.1890.1177" timestamp="1600841294124" />
<state x="91" y="351" key="Vcs.Push.Dialog.v2/30.23.1890.1177@30.23.1890.1177" timestamp="1600860006889" />
<state x="92" y="351" key="Vcs.Push.Dialog.v2/31.23.1889.1177@31.23.1889.1177" timestamp="1595584299423" />
<state x="87" y="216" key="com.intellij.openapi.editor.actions.MultiplePasteAction$ClipboardContentChooser" timestamp="1594705166397">
<screen x="31" y="23" width="1889" height="1177" />
......
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