Commits · 24ead12f23105e6672e195b1ef53a8b1ed6b88a1 · 王鸿源 / xiaoxiaole

08 May, 2020 10 commits
- Merge branch 'dev' of http://gitlab2.dui88.com/wanghongyuan/xiaoxiaole into 草地 · 24ead12f
  zjz1994 authored May 08, 2020
  
  24ead12f
- 调整引导显示 · b268c5a3
  zjz1994 authored May 08, 2020
  
  b268c5a3
- Merge branch 'dev' of http://gitlab2.dui88.com/wanghongyuan/xiaoxiaole into 草地 · de45bb4e
  zjz1994 authored May 08, 2020
```
# Conflicts:
#	egret/resource/default.res.json
```
  de45bb4e
- 给loading图加提示字 · c8c4d626
  zjz1994 authored May 08, 2020
  
  c8c4d626
- 铺草暂存 · c9c85dee
  zjz1994 authored May 08, 2020
  
  c9c85dee
- Merge branch 'dev' of http://gitlab2.dui88.com/wanghongyuan/xiaoxiaole into 草地 · 5529bfa7
  zjz1994 authored May 08, 2020
```
# Conflicts:
#	egret/resource/default.res.json
合并loading，调整引导
```
  5529bfa7
- 暂存 · fd03dba3
  zjz1994 authored May 08, 2020
  
  fd03dba3
- 代码暂存 · 49981ce6
  zjz1994 authored May 08, 2020
  
  49981ce6
- loading暂存 · 41d13a81
  zjz1994 authored May 08, 2020
  
  41d13a81
- 引导遮罩调整 · 95864405
  zjz1994 authored May 08, 2020
  
  95864405
07 May, 2020 6 commits
- 代码暂存 · c38b861d
  zjz1994 authored May 07, 2020
  
  c38b861d
- 特效消除前暂存 · acc6c6af
  zjz1994 authored May 07, 2020
  
  acc6c6af
- 调整特效铺草 · 87826b84
  zjz1994 authored May 07, 2020
  
  87826b84
- 通关目标暂存 · 986a796d
  zjz1994 authored May 07, 2020
  
  986a796d
- 传送带+草坪 · 7d3afc3f
  zjz1994 authored May 07, 2020
  
  7d3afc3f
- 草坪暂存 · 17ae0401
  zjz1994 authored May 07, 2020
  
  17ae0401
06 May, 2020 8 commits
- 草坪暂存 · 09997e13
  zjz1994 authored May 06, 2020
  
  09997e13
- 草坪暂存 · 93fd0008
  zjz1994 authored May 06, 2020
  
  93fd0008
- Merge branch 'dev' of http://gitlab2.dui88.com/wanghongyuan/xiaoxiaole into 草地 · ab573342
  zjz1994 authored May 06, 2020
```
# Conflicts:
#	egret/src/something/chapters/Chapter27.ts
```
  ab573342
- Merge branch 'master' of http://gitlab2.dui88.com/wanghongyuan/xiaoxiaole into dev · 2f0c1925
  zjz1994 authored May 06, 2020
  
  2f0c1925
- 676-700关卡 · 95f57a63
  zjz1994 authored May 06, 2020
  
  95f57a63
- 草地暂存 · 7add61de
  zjz1994 authored May 06, 2020
  
  7add61de
- 调整铺草时机，添加无藤曼猩猩部位特效铺草 · 5de9a8d7
  zjz1994 authored May 06, 2020
  
  5de9a8d7
- 草坪功能暂存 · 2e1423fa
  zjz1994 authored May 06, 2020
  
  2e1423fa
30 Apr, 2020 2 commits
- 1 · b46125c9
  wildfirecode authored Apr 30, 2020
  
  b46125c9
- 1 · b987f632
  wildfirecode authored Apr 30, 2020
  
  b987f632
29 Apr, 2020 10 commits
- 草坪暂存 · 3a8b4f9d
  zjz1994 authored Apr 29, 2020
  
  3a8b4f9d
- Merge branch '676-700关卡' of http://gitlab2.dui88.com/wanghongyuan/xiaoxiaole into 草地 · 1264dae8
  zjz1994 authored Apr 29, 2020
```
# Conflicts:
#	egret/src/something/chapters/Chapter26.ts
合并0429黑洞元素版本
```
  1264dae8
- Merge branch 'dev' of http://gitlab2.dui88.com/wanghongyuan/xiaoxiaole into 676-700关卡 · 521661dd
  zjz1994 authored Apr 29, 2020
  
  521661dd
- 调整黑洞动画 · 1d037462
  zjz1994 authored Apr 29, 2020
  
  1d037462
- 新增黑洞引导 · f150c840
  zjz1994 authored Apr 29, 2020
  
  f150c840
- 代码暂存 · b74cc7fb
  zjz1994 authored Apr 29, 2020
  
  b74cc7fb
- 黑洞引导暂存 · a409bb92
  zjz1994 authored Apr 29, 2020
  
  a409bb92
- 新增关卡 · d4c713ce
  zjz1994 authored Apr 29, 2020
  
  d4c713ce
- 添加651-675关卡 · 8f844f39
  zjz1994 authored Apr 29, 2020
  
  8f844f39
- 草地暂存 · 5abc1aff
  zjz1994 authored Apr 29, 2020
  
  5abc1aff
28 Apr, 2020 4 commits
- 修改糖果bug · d6ddd7e9
  zjz1994 authored Apr 28, 2020
  
  d6ddd7e9
- 糖果变特效出问题 · ef9b23b9
  zjz1994 authored Apr 28, 2020
  
  ef9b23b9
- Merge branch 'master' of http://gitlab2.dui88.com/wanghongyuan/xiaoxiaole into dev · cb1a1f61
  zjz1994 authored Apr 28, 2020
  
  cb1a1f61
- 调整动效，调整烟花层级 · 516eedb9
  zjz1994 authored Apr 28, 2020
  
  516eedb9