Commits · cb1a1f61414f3686736db5604bc076289c023f13 · 王鸿源 / xiaoxiaole

28 Apr, 2020 2 commits
- 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 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 12 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
- Merge branch 'dev' of http://gitlab2.dui88.com/wanghongyuan/xiaoxiaole · d3d4b30c
  zjz1994 authored Apr 22, 2020
  
  d3d4b30c
- 调整免费次数位置 · 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
- Merge branch 'dev' · 4a1b8de9
  zjz1994 authored Apr 22, 2020
  
  4a1b8de9
- 调整显示 · 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 2 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