Commits · 872142903a3215730987ff7a4b98ab755c1b0555 · 王鸿源 / xiaoxiaole

27 May, 2020 4 commits
- 动画暂存 · 87214290
  zjz1994 authored May 27, 2020
  
  87214290
- 新元素动画调整 · b7501c26
  zjz1994 authored May 27, 2020
  
  b7501c26
- 新元素动画 · bc650908
  zjz1994 authored May 27, 2020
  
  bc650908
- 调整动画 · 34b7e815
  zjz1994 authored May 27, 2020
  
  34b7e815
26 May, 2020 3 commits
- 新元素动画暂存 · 94e8ca88
  zjz1994 authored May 26, 2020
  
  94e8ca88
- 新元素引导与节日元素合并 · 3a5dd1c7
  zjz1994 authored May 26, 2020
  
  3a5dd1c7
- 新元素暂存 · 9804c4c5
  zjz1994 authored May 26, 2020
  
  9804c4c5
25 May, 2020 7 commits
- 新元素资源 · df3bf886
  zjz1994 authored May 25, 2020
  
  df3bf886
- Merge branch 'dev' of http://gitlab2.dui88.com/wanghongyuan/xiaoxiaole into 优化地图map · 05f28672
  zjz1994 authored May 25, 2020
  
  05f28672
- 代码暂存 · e43453e8
  zjz1994 authored May 25, 2020
  
  e43453e8
- 红包炸弹大小调整 · e25801d1
  zjz1994 authored May 25, 2020
  
  e25801d1
- 冰下食物元素 · 21b3fade
  zjz1994 authored May 25, 2020
  
  21b3fade
- 测试744卡住 · a85b70cd
  zjz1994 authored May 25, 2020
  
  a85b70cd
- 石门河豚问题 · 06b4513e
  zjz1994 authored May 25, 2020
  
  06b4513e
22 May, 2020 4 commits
- 强引导关卡修改 · 0c1287ef
  zjz1994 authored May 22, 2020
  
  0c1287ef
- 广告enable和img图片的影响 · 9becb750
  zjz1994 authored May 22, 2020
  
  9becb750
- 新增广告处理 · 4c72c1fe
  zjz1994 authored May 22, 2020
  
  4c72c1fe
- 食物关卡兼容 · 9ad2908b
  zjz1994 authored May 22, 2020
  
  9ad2908b
21 May, 2020 4 commits
- 代码暂存 · 5ec54997
  zjz1994 authored May 21, 2020
  
  5ec54997
- 新增city--------code · daf31499
  zjz1994 authored May 21, 2020
  
  daf31499
- city代码暂存 · 650194ce
  zjz1994 authored May 21, 2020
  
  650194ce
- 食物元素暂存 · 96e59e0f
  zjz1994 authored May 21, 2020
  
  96e59e0f
20 May, 2020 6 commits
- 暂时去除全屏显示 · 5657e609
  zjz1994 authored May 20, 2020
  
  5657e609
- Merge branch 'dev' of http://gitlab2.dui88.com/wanghongyuan/xiaoxiaole into 优化地图map · 30f717ea
  zjz1994 authored May 20, 2020
```
# Conflicts:
#	egret/src/something/chapters/Chapter29.ts
```
  30f717ea
- 关卡暂存 · b4dfd297
  zjz1994 authored May 20, 2020
  
  b4dfd297
- 调整增加步数位置 · 549ac9ed
  zjz1994 authored May 20, 2020
  
  549ac9ed
- 新关卡 · b33d2f90
  zjz1994 authored May 20, 2020
  
  b33d2f90
- 地图优化，红包炸弹调整 · 51bb863b
  zjz1994 authored May 20, 2020
  
  51bb863b
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 1 commit
- 代码暂存 · 21940e7d
  zjz1994 authored May 15, 2020
  
  21940e7d