Merge branch 'zhonghe_answer' of http://gitlab2.dui88.com/clq/db-game-template into zhonghe_answer
# Conflicts: # egret/resource/TextureMerger/answer_scene.tmproject # egret/resource/TextureMerger/result_scene.tmproject # egret/resource/assets/ResultScene/example.jpg # egret/resource/assets/ResultScene/result_bg.jpg # egret/resource/assets/ResultScene/result_btn_restart.png # egret/resource/assets/answer_scene/answer_bg.jpg # egret/resource/assets/common/result_1.png # egret/resource/assets/common/result_2.png # egret/resource/assets/common/result_3.png # egret/resource/assets/common/result_4.png # egret/resource/assets/main_scene/main_bg.jpg # egret/resource/assets/main_scene/main_qrcode_img.png # egret/resource/assets/share_img/share_qrcode.png # egret/resource/default.res.json # egret/resource/skins/AnswerSceneSkin.exml # egret/resource/skins/MainSceneSkin.exml # egret/resource/skins/ResultSceneSkin.exml # egret/resource/skins/ShareImg.exml # egret/src/MUtils.ts # egret/src/Main.ts # egret/src/RulePanel.ts # egret/src/Scene/MainScene.ts # egret/src/Scene/ResultScene.ts # egret/src/ctrls/sceneCtrl.ts # egret/src/views/Panel.ts # egret/src/views/SkinScene.ts
Showing
8.85 KB
29.5 KB
29.2 KB
92.2 KB
963 Bytes
978 Bytes
This diff is collapsed.
85 Bytes
165 KB
361 KB
2.07 KB
105 KB
144 KB
1.67 KB
1.43 KB
10.8 KB
5.97 KB
74 KB
107 KB
149 KB
2.95 KB
71 KB
116 KB
100 KB
84 KB
110 KB
100 KB
64.7 KB
6.5 KB
2.84 KB
172 KB
4.05 KB
802 Bytes
6.35 KB
101 KB
30.2 KB
118 KB
4.22 KB
11.4 KB
82 Bytes
165 Bytes
204 Bytes
361 KB
381 KB
382 KB
375 KB
387 KB
112 KB
30.7 KB
5.68 KB
8.74 KB
6.19 KB
8.47 KB
30.5 KB
263 KB
100 KB
1.05 KB
176 KB
105 KB
43.3 KB
9.47 KB
egret/src/Game/Ant.ts
0 → 100644
egret/src/Game/GameObject.ts
0 → 100644
egret/src/Game/GameStage.ts
0 → 100644
egret/src/Game/GoldCoin.ts
0 → 100644
egret/src/Game/Leg.ts
0 → 100644
egret/src/Game/Legs.ts
0 → 100644
egret/src/MConst.ts
0 → 100644
egret/src/Mgr/DebugMgr.ts
0 → 100644
egret/src/Mgr/GameMgr.ts
0 → 100644
egret/src/Panel/RulePanel.ts
0 → 100644
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
egret/src/Scene/LoadScene.ts
0 → 100644
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
mock/json/buySummerProp.json
0 → 100644
This diff is collapsed.
mock/json/collect.json
0 → 100644
This diff is collapsed.
mock/json/collectFood.json
0 → 100644
This diff is collapsed.
mock/json/customSubmit.json
0 → 100644
This diff is collapsed.
mock/json/datapash.json
0 → 100644
This diff is collapsed.
mock/json/doJoin.json
0 → 100644
This diff is collapsed.
This diff is collapsed.
mock/json/doRevive.json
0 → 100644
This diff is collapsed.
mock/json/doSign.json
0 → 100644
This diff is collapsed.
mock/json/dostart.json
0 → 100644
This diff is collapsed.
mock/json/gameSubmit.json
0 → 100644
This diff is collapsed.
mock/json/getActToys.json
0 → 100644
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
mock/json/getCredits.json
0 → 100644
This diff is collapsed.
This diff is collapsed.
mock/json/getFoodPiles.json
0 → 100644
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
mock/json/getInfo.json
0 → 100644
This diff is collapsed.
mock/json/getOptions.json
0 → 100644
This diff is collapsed.
mock/json/getOrderInfo.json
0 → 100644
This diff is collapsed.
mock/json/getPetInfo.json
0 → 100644
This diff is collapsed.
mock/json/getPetStatus.json
0 → 100644
This diff is collapsed.
This diff is collapsed.
mock/json/getPrizeInfo.json
0 → 100644
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
mock/json/getRole.json
0 → 100644
This diff is collapsed.
mock/json/getRule.json
0 → 100644
This diff is collapsed.
mock/json/getShareCode.json
0 → 100644
This diff is collapsed.
This diff is collapsed.
mock/json/getSummerInfo.json
0 → 100644
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
mock/json/goout.json
0 → 100644
This diff is collapsed.
mock/json/gooutResult.json
0 → 100644
This diff is collapsed.
mock/json/gooutReward.json
0 → 100644
This diff is collapsed.
mock/json/guessPoker.json
0 → 100644
This diff is collapsed.
mock/json/home.json
0 → 100644
This diff is collapsed.
mock/json/join.json
0 → 100644
This diff is collapsed.
This diff is collapsed.
mock/json/optionInfo.json
0 → 100644
This diff is collapsed.
mock/json/petAdopte.json
0 → 100644
This diff is collapsed.
mock/json/petFeed.json
0 → 100644
This diff is collapsed.
mock/json/realtimerank.json
0 → 100644
This diff is collapsed.
mock/json/realtimerank2.json
0 → 100644
This diff is collapsed.
mock/json/setRole.json
0 → 100644
This diff is collapsed.
mock/json/shopYunji.json
0 → 100644
This diff is collapsed.
mock/json/signInfo.json
0 → 100644
This diff is collapsed.
mock/json/summon.json
0 → 100644
This diff is collapsed.
mock/json/teamInfo.json
0 → 100644
This diff is collapsed.
This diff is collapsed.
mock/json/unblocking.json
0 → 100644
This diff is collapsed.
mock/json/weOrder.json
0 → 100644
This diff is collapsed.
mock/json/winranks.json
0 → 100644
This diff is collapsed.
mock/json/wordscheck.json
0 → 100644
This diff is collapsed.