Commits · 72ec9d5e17302aad9e53e6a8f1b759f9ddc2a00a · 王鸿源 / xiaoxiaole

24 Apr, 2020 1 commit
- lattice回收 · 72ec9d5e
  zjz1994 authored Apr 24, 2020
  
  72ec9d5e
23 Apr, 2020 11 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
- 性能优化暂存 · 49f02422
  zjz1994 authored Apr 23, 2020
  
  49f02422
- Merge branch 'dev' of http://gitlab2.dui88.com/wanghongyuan/xiaoxiaole into 优化性能 · 08c4c0b3
  zjz1994 authored Apr 23, 2020
  
  08c4c0b3
- 猩猩默认动画 · 01589e96
  zjz1994 authored Apr 23, 2020
  
  01589e96
- 调整石门冰块和猩猩透明问题 · 1aefe88a
  zjz1994 authored Apr 23, 2020
  
  1aefe88a
- 优化炮台 · 80fa00a4
  zjz1994 authored Apr 23, 2020
  
  80fa00a4
- 优化暂存 · 251bce34
  zjz1994 authored Apr 23, 2020
  
  251bce34
- 优化性能暂存 · 9ce49c8a
  zjz1994 authored Apr 23, 2020
  
  9ce49c8a
22 Apr, 2020 10 commits
- Merge branch 'dev' of http://gitlab2.dui88.com/wanghongyuan/xiaoxiaole into 优化性能 · 89e088d3
  zjz1994 authored Apr 22, 2020
  
  89e088d3
- Merge branch 'dev' of http://gitlab2.dui88.com/wanghongyuan/xiaoxiaole into 黑洞 · 572ad7df
  zjz1994 authored Apr 22, 2020
  
  572ad7df
- 调整免费次数位置 · 9019b6f3
  zjz1994 authored Apr 22, 2020
  
  9019b6f3
- Merge branch 'dev' of http://gitlab2.dui88.com/wanghongyuan/xiaoxiaole into 黑洞 · a7ebd7ad
  zjz1994 authored Apr 22, 2020
```
# Conflicts:
#	egret/src/something/chapters/Chapter25.ts
合并0422--新增650关卡
```
  a7ebd7ad
- Merge branch 'dev' of http://gitlab2.dui88.com/wanghongyuan/xiaoxiaole into 优化性能 · c94f4077
  zjz1994 authored Apr 22, 2020
  
  c94f4077
- 调整显示 · fdddf17f
  zjz1994 authored Apr 22, 2020
  
  fdddf17f
- 新增626-650关卡 · 7ca6a389
  zjz1994 authored Apr 22, 2020
  
  7ca6a389
- 性能优化暂存 · 95074d48
  zjz1994 authored Apr 22, 2020
  
  95074d48
- 调整按钮位置 · 4b871149
  zjz1994 authored Apr 22, 2020
  
  4b871149
- 性能优化暂存 · 8bfe8d17
  zjz1994 authored Apr 22, 2020
  
  8bfe8d17
21 Apr, 2020 2 commits
- 单例实现游戏页面 · 2ea5fb9e
  zjz1994 authored Apr 21, 2020
  
  2ea5fb9e
- Merge branch 'dev' of http://gitlab2.dui88.com/wanghongyuan/xiaoxiaole into 黑洞 · a9d742db
  zjz1994 authored Apr 21, 2020
```
# Conflicts:
#	egret/src/mainScene/MainScene.ts
合并dev修改的233关步骤
```
  a9d742db
20 Apr, 2020 1 commit
- 优化性能暂存 · 58f6f2a4
  zjz1994 authored Apr 20, 2020
  
  58f6f2a4
17 Apr, 2020 8 commits
- Merge branch 'master' of http://gitlab2.dui88.com/wanghongyuan/xiaoxiaole into dev · 3b64daed
  zjz1994 authored Apr 17, 2020
  
  3b64daed
- 代码暂存 · 12e321fa
  zjz1994 authored Apr 17, 2020
  
  12e321fa
- 黑洞调整怪兽 · 1c9fbe56
  zjz1994 authored Apr 17, 2020
  
  1c9fbe56
- Merge branch 'dev' of http://gitlab2.dui88.com/wanghongyuan/xiaoxiaole into 黑洞 · f96ec630
  zjz1994 authored Apr 17, 2020
```
# Conflicts:
#	egret/index.html
#	egret/src/something/chapters/Chapter25.ts
#	egret/src/something/chapters/getChapter.ts
#	mock/happyclear/home.json
合并dev
```
  f96ec630
- 减少大炮的遍历 · ba58cb0f
  zjz1994 authored Apr 17, 2020
  
  ba58cb0f
- 黑洞转移前，将本次操作的导致的元素状态变化先变了 · 241e286d
  zjz1994 authored Apr 17, 2020
  
  241e286d
- 新增关卡625-650 · dc2f8aac
  zjz1994 authored Apr 17, 2020
  
  dc2f8aac
- 暂存 · 7e80f0bf
  zjz1994 authored Apr 17, 2020
  
  7e80f0bf
16 Apr, 2020 7 commits
- 调整黑洞在所有动态切换元素切换完毕后转移 · 9e103194
  zjz1994 authored Apr 16, 2020
  
  9e103194
- 黑洞与烟花 · 83a5d042
  zjz1994 authored Apr 16, 2020
  
  83a5d042
- 大炮，大炮石头的黑洞支持 · ece84fb2
  zjz1994 authored Apr 16, 2020
  
  ece84fb2
- 调整黑洞大炮前暂存 · ba9b57d8
  zjz1994 authored Apr 16, 2020
  
  ba9b57d8
- 黑洞转移普通元素，石门，冰块组合，不出现流沙 · 6a6b8c07
  zjz1994 authored Apr 16, 2020
  
  6a6b8c07
- Merge branch 'dev' of http://gitlab2.dui88.com/wanghongyuan/xiaoxiaole into 黑洞 · e6e33a2a
  zjz1994 authored Apr 16, 2020
```
# Conflicts:
#	egret/src/mainScene/MainScene.ts
#	egret/src/something/chapters/Chapter24.ts
合并0416猩猩版本
```
  e6e33a2a
- 调整map稍微靠下时底部黑边问题 · 93d63bff
  zjz1994 authored Apr 16, 2020
  
  93d63bff