Skip to content

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

1

parent a8fbcdf3
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 132 additions and 8396 deletions
.idea/workspace.xml
View file @ fa4e1cc2
...@@ -3,8 +3,10 @@ ...@@ -3,8 +3,10 @@
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="9cef0552-af3c-4a1c-be1f-dc41ebe5b6db" name="Default Changelist" comment=""> <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$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/panels/StartPanel.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/panels/StartPanel.ts" afterDir="false" /> <change beforePath="$PROJECT_DIR$/resource/res.json" beforeDir="false" afterPath="$PROJECT_DIR$/resource/res.json" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/panels/StartPanelPrize.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/panels/StartPanelPrize.ts" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/ResJson.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/ResJson.ts" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/SkinJson.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/SkinJson.ts" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/panels/BuyPowerPanel.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/panels/BuyPowerPanel.ts" afterDir="false" />
</list> </list>
<option name="SHOW_DIALOG" value="false" /> <option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" /> <option name="HIGHLIGHT_CONFLICTS" value="true" />
...@@ -87,8 +89,8 @@ ...@@ -87,8 +89,8 @@
</configuration> </configuration>
<recent_temporary> <recent_temporary>
<list> <list>
<item itemvalue="npm.dev" />
<item itemvalue="npm.flushRes" /> <item itemvalue="npm.flushRes" />
<item itemvalue="npm.dev" />
</list> </list>
</recent_temporary> </recent_temporary>
</component> </component>
...@@ -116,7 +118,7 @@ ...@@ -116,7 +118,7 @@
<workItem from="1595382049907" duration="765000" /> <workItem from="1595382049907" duration="765000" />
<workItem from="1595382857407" duration="11007000" /> <workItem from="1595382857407" duration="11007000" />
<workItem from="1595468598356" duration="15042000" /> <workItem from="1595468598356" duration="15042000" />
<workItem from="1595555429502" duration="9548000" /> <workItem from="1595555429502" duration="11023000" />
</task> </task>
<task id="LOCAL-00001" summary="111"> <task id="LOCAL-00001" summary="111">
<created>1594122339119</created> <created>1594122339119</created>
...@@ -365,26 +367,26 @@ ...@@ -365,26 +367,26 @@
<screen x="31" y="23" width="1889" height="1177" /> <screen x="31" y="23" width="1889" height="1177" />
</state> </state>
<state x="558" y="183" width="884" height="891" key="CommitChangelistDialog2/31.23.1889.1177@31.23.1889.1177" timestamp="1595388353114" /> <state x="558" y="183" width="884" height="891" key="CommitChangelistDialog2/31.23.1889.1177@31.23.1889.1177" timestamp="1595388353114" />
<state width="1085" height="321" key="GridCell.Tab.0.bottom" timestamp="1595574626482"> <state width="1041" height="321" key="GridCell.Tab.0.bottom" timestamp="1595579918465">
<screen x="31" y="23" width="1889" height="1177" /> <screen x="31" y="23" width="1889" height="1177" />
</state> </state>
<state width="866" height="321" key="GridCell.Tab.0.bottom/31.23.1649.1027@31.23.1649.1027" timestamp="1595348373239" /> <state width="866" height="321" key="GridCell.Tab.0.bottom/31.23.1649.1027@31.23.1649.1027" timestamp="1595348373239" />
<state width="1085" height="321" key="GridCell.Tab.0.bottom/31.23.1889.1177@31.23.1889.1177" timestamp="1595574626482" /> <state width="1041" height="321" key="GridCell.Tab.0.bottom/31.23.1889.1177@31.23.1889.1177" timestamp="1595579918465" />
<state width="1085" height="321" key="GridCell.Tab.0.center" timestamp="1595574626481"> <state width="1041" height="321" key="GridCell.Tab.0.center" timestamp="1595579918464">
<screen x="31" y="23" width="1889" height="1177" /> <screen x="31" y="23" width="1889" height="1177" />
</state> </state>
<state width="866" height="321" key="GridCell.Tab.0.center/31.23.1649.1027@31.23.1649.1027" timestamp="1595348373238" /> <state width="866" height="321" key="GridCell.Tab.0.center/31.23.1649.1027@31.23.1649.1027" timestamp="1595348373238" />
<state width="1085" height="321" key="GridCell.Tab.0.center/31.23.1889.1177@31.23.1889.1177" timestamp="1595574626481" /> <state width="1041" height="321" key="GridCell.Tab.0.center/31.23.1889.1177@31.23.1889.1177" timestamp="1595579918464" />
<state width="1085" height="321" key="GridCell.Tab.0.left" timestamp="1595574626481"> <state width="1041" height="321" key="GridCell.Tab.0.left" timestamp="1595579918463">
<screen x="31" y="23" width="1889" height="1177" /> <screen x="31" y="23" width="1889" height="1177" />
</state> </state>
<state width="866" height="321" key="GridCell.Tab.0.left/31.23.1649.1027@31.23.1649.1027" timestamp="1595348373237" /> <state width="866" height="321" key="GridCell.Tab.0.left/31.23.1649.1027@31.23.1649.1027" timestamp="1595348373237" />
<state width="1085" height="321" key="GridCell.Tab.0.left/31.23.1889.1177@31.23.1889.1177" timestamp="1595574626481" /> <state width="1041" height="321" key="GridCell.Tab.0.left/31.23.1889.1177@31.23.1889.1177" timestamp="1595579918463" />
<state width="1085" height="321" key="GridCell.Tab.0.right" timestamp="1595574626482"> <state width="1041" height="321" key="GridCell.Tab.0.right" timestamp="1595579918465">
<screen x="31" y="23" width="1889" height="1177" /> <screen x="31" y="23" width="1889" height="1177" />
</state> </state>
<state width="866" height="321" key="GridCell.Tab.0.right/31.23.1649.1027@31.23.1649.1027" timestamp="1595348373239" /> <state width="866" height="321" key="GridCell.Tab.0.right/31.23.1649.1027@31.23.1649.1027" timestamp="1595348373239" />
<state width="1085" height="321" key="GridCell.Tab.0.right/31.23.1889.1177@31.23.1889.1177" timestamp="1595574626482" /> <state width="1041" height="321" key="GridCell.Tab.0.right/31.23.1889.1177@31.23.1889.1177" timestamp="1595579918465" />
<state x="82" y="353" key="IDE.errors.dialog" timestamp="1594777965326"> <state x="82" y="353" key="IDE.errors.dialog" timestamp="1594777965326">
<screen x="31" y="23" width="1889" height="1177" /> <screen x="31" y="23" width="1889" height="1177" />
</state> </state>
...@@ -425,9 +427,9 @@ ...@@ -425,9 +427,9 @@
<screen x="31" y="23" width="1889" height="1177" /> <screen x="31" y="23" width="1889" height="1177" />
</state> </state>
<state x="157" y="286" key="run.anything.popup/31.23.1889.1177@31.23.1889.1177" timestamp="1595475548860" /> <state x="157" y="286" key="run.anything.popup/31.23.1889.1177@31.23.1889.1177" timestamp="1595475548860" />
<state x="640" y="288" width="670" height="676" key="search.everywhere.popup" timestamp="1595579540134"> <state x="640" y="288" width="670" height="676" key="search.everywhere.popup" timestamp="1595582195073">
<screen x="31" y="23" width="1889" height="1177" /> <screen x="31" y="23" width="1889" height="1177" />
</state> </state>
<state x="640" y="288" width="670" height="676" key="search.everywhere.popup/31.23.1889.1177@31.23.1889.1177" timestamp="1595579540134" /> <state x="640" y="288" width="670" height="676" key="search.everywhere.popup/31.23.1889.1177@31.23.1889.1177" timestamp="1595582195073" />
</component> </component>
</project> </project>
\ No newline at end of file
resource/res.json
View file @ fa4e1cc2
This diff is collapsed.
src/ResJson.ts
View file @ fa4e1cc2
This diff is collapsed.
src/SkinJson.ts
View file @ fa4e1cc2
...@@ -682,7 +682,7 @@ export const SkinJson = { ...@@ -682,7 +682,7 @@ export const SkinJson = {
"alpha": 1, "alpha": 1,
"type": "text", "type": "text",
"props": { "props": {
"text": "+\t15", "text": "+\t1",
"size": 36, "size": 36,
"fillColor": "#ffffff", "fillColor": "#ffffff",
"textAlpha": 1 "textAlpha": 1
......
src/panels/BuyPowerPanel.ts
View file @ fa4e1cc2
...@@ -22,8 +22,8 @@ export class BuyPowerPanel extends Panel { ...@@ -22,8 +22,8 @@ export class BuyPowerPanel extends Panel {
initUi() { initUi() {
const btnTxt: TextField = this.exchangeBtn.addChild(Tools.getText( const btnTxt: TextField = this.exchangeBtn.addChild(Tools.getText(
'30店铺积分', 36, '#ffffff', '10店铺积分', 36, '#ffffff',
TEXT_ALIGN.CENTER, this.exchangeBtn.width, 0, -3 TEXT_ALIGN.CENTER, this.exchangeBtn.width, 0, -6
)); ));
btnTxt.textHeight = this.exchangeBtn.height; btnTxt.textHeight = this.exchangeBtn.height;
......
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