Commits · 4962aa7dd8f929e66cf7cefbc947c133a65dada8 · 王鸿源 / xiaoxiaole

19 May, 2020 5 commits
- 代码暂存 · 4962aa7d
  zjz1994 authored May 19, 2020
  
  4962aa7d
- Merge branch '冰下动物' of http://gitlab2.dui88.com/wanghongyuan/xiaoxiaole into 优化地图map · abc443bb
  zjz1994 authored May 19, 2020
```
# Conflicts:
#	egret/index.html
#	egret/resource/skins/Main2Skin.exml
#	mock/happyclear/home.json
合并冰下动物
```
  abc443bb
- 地图调整 · 5bb1fbd7
  zjz1994 authored May 19, 2020
  
  5bb1fbd7
- 地图优化暂存 · f09b2dae
  zjz1994 authored May 19, 2020
  
  f09b2dae
- 冰下食物暂存 · 59181f75
  zjz1994 authored May 19, 2020
  
  59181f75
18 May, 2020 6 commits
- 食物暂存 · d39883bb
  zjz1994 authored May 18, 2020
  
  d39883bb
- 冰下动物暂存 · cb13ae72
  zjz1994 authored May 18, 2020
  
  cb13ae72
- Merge branch 'dev' of http://gitlab2.dui88.com/wanghongyuan/xiaoxiaole into 726-750关卡 · 54294280
  zjz1994 authored May 18, 2020
  
  54294280
- 全屏幕适配代码暂存 · deecdc2b
  zjz1994 authored May 18, 2020
  
  deecdc2b
- 适配暂存 · 01dd4530
  zjz1994 authored May 18, 2020
  
  01dd4530
- 代码暂存 · de8466aa
  zjz1994 authored May 18, 2020
  
  de8466aa
15 May, 2020 2 commits
- 代码暂存 · 21940e7d
  zjz1994 authored May 15, 2020
  
  21940e7d
- deviceready处理 · 1877e80c
  zjz1994 authored May 15, 2020
  
  1877e80c
14 May, 2020 13 commits
- 代码暂存 · 41b020e6
  zjz1994 authored May 14, 2020
  
  41b020e6
- 代码暂存 · 095641d4
  zjz1994 authored May 14, 2020
  
  095641d4
- 代码暂存 · 0ee1c419
  zjz1994 authored May 14, 2020
  
  0ee1c419
- 埋点暂存 · d1fff4f9
  zjz1994 authored May 14, 2020
  
  d1fff4f9
- 代码暂存 · c0b4c569
  zjz1994 authored May 14, 2020
  
  c0b4c569
- 新增deviceId · 60dccbb9
  zjz1994 authored May 14, 2020
  
  60dccbb9
- 地图暂存 · 08c0f4ad
  zjz1994 authored May 14, 2020
  
  08c0f4ad
- 726-750关卡 · 6a028552
  zjz1994 authored May 14, 2020
  
  6a028552
- 地图页优化暂存 · 7b478ad5
  zjz1994 authored May 14, 2020
  
  7b478ad5
- deviceid获取 · b83df1bb
  zjz1994 authored May 14, 2020
  
  b83df1bb
- 获取deviceid测试 · b39a8014
  zjz1994 authored May 14, 2020
  
  b39a8014
- 优化暂存 · 00d20b96
  zjz1994 authored May 14, 2020
  
  00d20b96
- 代码暂存 · 5e2dac8e
  zjz1994 authored May 14, 2020
  
  5e2dac8e
13 May, 2020 14 commits
- 中文跳转修改 · 5dd557bb
  zjz1994 authored May 13, 2020
  
  5dd557bb
- 0513版本 · c7efa910
  zjz1994 authored May 13, 2020
  
  c7efa910
- 地图优化暂存 · b17cb180
  zjz1994 authored May 13, 2020
  
  b17cb180
- Merge branch 'dev' of http://gitlab2.dui88.com/wanghongyuan/xiaoxiaole into 优化地图map · d9240176
  zjz1994 authored May 13, 2020
  
  d9240176
- 代码暂存 · e6d66b73
  zjz1994 authored May 13, 2020
  
  e6d66b73
- 新关卡 · 74612240
  zjz1994 authored May 13, 2020
  
  74612240
- 代码暂存 · 33518ae0
  zjz1994 authored May 13, 2020
  
  33518ae0
- 优化map暂存 · a8279b28
  zjz1994 authored May 13, 2020
  
  a8279b28
- 红包规则修改 · 635fcb38
  zjz1994 authored May 13, 2020
  
  635fcb38
- 暂存 · 4c007df4
  zjz1994 authored May 13, 2020
  
  4c007df4
- 关卡修改 · 4d10f299
  zjz1994 authored May 13, 2020
  
  4d10f299
- Merge branch '0511红包炸弹' of http://gitlab2.dui88.com/wanghongyuan/xiaoxiaole into dev · 8e2aa3ca
  zjz1994 authored May 13, 2020
```
# Conflicts:
#	egret/resource/default.res.json
#	mock/happyclear/home.json
合并红包炸弹
```
  8e2aa3ca
- 红包大作战暂存 · 0113667d
  zjz1994 authored May 13, 2020
  
  0113667d
- 红包调整 · 9446ee6e
  zjz1994 authored May 13, 2020
  
  9446ee6e