Commits · 7d3afc3f07633bc99e4ccdd5a942d863e2e235a8 · 王鸿源 / xiaoxiaole

07 May, 2020 2 commits
- 传送带+草坪 · 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
27 Apr, 2020 4 commits
- 解决关卡过关卡住，烟花的bug · 02d4da10
  zjz1994 authored Apr 27, 2020
  
  02d4da10
- 修改烟花和黑洞的bug，加入黑洞动画 · 85cc4884
  zjz1994 authored Apr 27, 2020
  
  85cc4884
- 1 · b395da78
  wildfirecode authored Apr 27, 2020
  
  b395da78
- 修改烟花pro添加重复导致all释放不了引起的页面无法点击问题 · d8cb8ff9
  zjz1994 authored Apr 27, 2020
  
  d8cb8ff9
26 Apr, 2020 5 commits
- 修改引导词 · 212eb24e
  zjz1994 authored Apr 26, 2020
  
  212eb24e
- 黑洞烟花卡住游戏bug暂存 · e221eb03
  zjz1994 authored Apr 26, 2020
  
  e221eb03
- 游戏结束不动 · 75521c9a
  zjz1994 authored Apr 26, 2020
  
  75521c9a
- 修复黑洞转移没填补empty的bug · 466a18aa
  zjz1994 authored Apr 26, 2020
  
  466a18aa
- 调整深冰块显示 · adfb0cde
  zjz1994 authored Apr 26, 2020
  
  adfb0cde
24 Apr, 2020 1 commit
- lattice回收 · 72ec9d5e
  zjz1994 authored Apr 24, 2020
  
  72ec9d5e
23 Apr, 2020 4 commits
- 暂存 · 2f51b2a8
  zjz1994 authored Apr 23, 2020
  
  2f51b2a8
- 卡游戏显示默认北京页Bug · 56d675c8
  zjz1994 authored Apr 23, 2020
  
  56d675c8
- Merge branch '优化性能' of http://gitlab2.dui88.com/wanghongyuan/xiaoxiaole into 黑洞 · 27d77726
  zjz1994 authored Apr 23, 2020
```
# Conflicts:
#	egret/src/mainScene/MainScene.ts
#	egret/src/something/Tool.ts
#	egret/src/something/block/BaseBlock.ts
#	egret/src/something/class/Element.ts
合并性能优化
```
  27d77726
- Merge branch 'dev' of http://gitlab2.dui88.com/wanghongyuan/xiaoxiaole into 黑洞 · 168ecf72
  zjz1994 authored Apr 23, 2020
  
  168ecf72