活动 - 汤姆猫学英语 - 成都奔狐信息技术有限公司

活动

从 2018-12-18 到 2019-01-16

2019-01-16

18:11 修订 4733f7ba: 修复dragto,设置镜头初位置: ZhouGang
17:59 修订 20a2c503: Merge branch 'develop_native' of rm.runfox.com:root/rf_runfox_h5 into develop_native: leen
17:58 修订 3707a8cc: 食物商场: leen
17:44 修订 fa276c29: 截图接口: 张张涛
17:42 修订 a29ee036: *修改语音引擎初始化: cloud
17:38 修订 d480f5a3: *修改语音评测: cloud
17:06 修订 5b448731: shake: 张张涛
16:30 修订 482497e2: *同步修改语音引擎: 缥缈的云
16:23 修订 10a09f40: 不同场景相同背景音乐不再重复播放: 张张涛
16:21 修订 2705f1d1: Merge branch 'develop_native' of rm.runfox.com:root/rf_runfox_h5 into develop_native: ZhouGang
16:21 修订 12314052: update: ZhouGang
16:18 修订 7c11b5ea: 气泡缩放: 张张涛
16:13 修订 82ba43c5: 镜头移动callback: ZhouGang
14:59 修订 6722db40: Merge branch 'develop_native' of rm.runfox.com:root/rf_runfox_h5 into develop_native: ZhouGang
14:59 修订 7fc58787: 解决课程中角色消失问题: ZhouGang
14:58 修订 52d3c781: *优化设备获取: cloud
14:44 修订 b75fcc7b: *修改android包名: cloud
14:39 修订 d2527845: Merge branch 'develop_native' of http://rm.runfox.com/gitlab/root/rf_runfox_h5 into ...: 张张涛
14:38 修订 69305ada: 背景移动模拟摄像机: 张张涛
14:37 修订 30f10ab6: *修改构建: cloud
14:29 修订 92450d13: *优化调用: cloud
11:14 修订 cbb507c0: no message: luh
10:43 修订 b82ceb59: *优化deviceID: cloud
09:38 修订 8cc7ee4a: *添加roleid提示: cloud

2019-01-15

17:53 修订 28b23c37: *退出清空当前角色: cloud
17:36 修订 9a4e32bd: *同步修改到android: cloud
17:32 修订 bc024ba7: Merge branch 'develop_native' of rm.runfox.com:root/rf_runfox_h5 into develop_native: 邓小涛
17:31 修订 1a843358: plugin: 邓小涛
17:31 修订 964e47b9: commit: 邓小涛
16:34 修订 43116f1d: *优化加密过程: cloud
16:17 修订 5623c64a: *判断是否为空: cloud
16:12 修订 7dc509a8: 移出crypto-js: ZhouGang
15:33 修订 628c2a2f: 游戏结束后更新单词卡颜色: 张张涛
15:27 修订 b8eaa529: 修改字幕显示问题: ZhouGang
15:01 修订 f95a3e51: 无用变量: 张张涛
14:51 修订 ddf02a65: 角色坐着拿东西动画: leen
14:24 修订 e276022a: V1.0.0 build 3: ZhouGang
13:49 修订 7f1dd317: Merge branch 'develop_native' of rm.runfox.com:root/rf_runfox_h5 into develop_native: leen
13:49 修订 d88112b8: 修复物品角色有时不能放在桌子、沙发上的bug: 角色能进抽屉的bug
物品有时候会掉下去的bug
onLoad的一些代码移到start里面 leen
11:22 修订 2762255a: *修改uid获取: cloud
11:14 修订 aa197ced: 课程中移动物品循环滚动: 张张涛
10:58 修订 8cd6921f: Merge branch 'develop_native' of http://rm.runfox.com/gitlab/root/rf_runfox_h5 into ...: luh
10:58 修订 45d43954: no message: luh
10:27 修订 db575f00: *修改支付插件: cloud
10:13 修订 86162fdd: *修改deviceId获取: cloud

2019-01-14

18:11 修订 cdfd04d8: no message: luh
18:11 修订 66c79c4a: no message: luh
17:58 修订 4f5a5232: 改为正式服: ZhouGang
17:53 修订 56b0fd4a: 修改特效循环问题，修改评测字幕问题: ZhouGang
17:48 修订 dd4b88a5: Merge branch 'develop_native' of rm.runfox.com:root/rf_runfox_h5 into develop_native: leen
17:48 修订 bd19260c: crashreport: leen
16:25 修订 e40d4115: no message: luh
15:58 修订 dcb2ba28: Merge branch 'develop_native' of rm.runfox.com:root/rf_runfox_h5 into develop_native: cloud
15:57 修订 f315dc89: *修改滚动速度: cloud
15:56 修订 c05b0a1f: Merge branch 'develop_native' of http://rm.runfox.com/gitlab/root/rf_runfox_h5 into ...: luh
15:56 修订 d7cb5ebd: no message: luh
15:56 修订 f1192c72: *同步登录: cloud
15:52 修订 bfe1aa31: no message: 张张涛
15:40 修订 ba92a820: no message: luh
14:43 修订 f4b08fda: no message: luh
14:29 修订 c1b3994a: a: leen
14:01 修订 7f520021: Merge branch 'develop_native' of rm.runfox.com:root/rf_runfox_h5 into develop_native: 邓小涛
14:00 修订 384aa467: commit bugly: 邓小涛
12:19 修订 85c99603: *同步videoplayer修改: cloud
12:07 修订 1baafd21: no message: 张张涛
12:06 修订 cf5d5131: Merge branch 'develop_native' of http://rm.runfox.com/gitlab/root/rf_runfox_h5 into ...: 张张涛
12:05 修订 d8691646: 兼容 web: 张张涛
12:03 修订 f41c5e6a: 优化交互: luh
11:53 修订 7207a017: no message: luh
10:51 修订 073376d7: a: leen
10:46 修订 e66895b0: *修改android包名: cloud
10:26 修订 5e1ef6c3: a: leen

2019-01-12

22:38 修订 3a0658c9: no message: 张张涛
22:10 修订 f1fde9aa: V1.0.0 buid 2: ZhouGang
21:44 修订 20c9977e: 修改资源加载中文字: JaneSnow
21:27 修订 1b0de72e: 修改商城人民币符号: JaneSnow
20:51 修订 917a5160: update: ZhouGang
20:48 修订 27bb9b23: V1.0.0 build 1: ZhouGang
20:09 修订 6836c511: Merge branch 'develop_native' of rm.runfox.com:root/rf_runfox_h5 into develop_native: ZhouGang
20:09 修订 ea271c3e: update: ZhouGang
20:05 修订 74c60d43: no message: luh
19:51 修订 0dc1af40: no message: 张张涛
19:20 修订 e1761e2b: Merge branch 'develop_native' of http://rm.runfox.com/gitlab/root/rf_runfox_h5 into ...: JaneSnow
19:19 修订 33e48510: 优化美术图片: JaneSnow
19:11 修订 49d744fb: Merge branch 'develop_native' of http://rm.runfox.com/gitlab/root/rf_runfox_h5 into ...: luh
19:09 修订 fa9e61aa: no message: luh
18:29 修订 2f1d4dc7: 修改界面文字并删除一个字体: JaneSnow
18:25 修订 d43fb4c6: 优化美术资源: luh
18:06 修订 918bd0b5: 优化字体资源: luh
17:43 修订 0cd28c98: no message: 张张涛
17:42 修订 1f8a8006: Merge branch 'develop_native' of rm.runfox.com:root/rf_runfox_h5 into develop_native: # Conflicts:
# build/jsb-default/frameworks/runtime-src/proj.ios_mac/ios/Info.plist 邓小涛
17:40 修订 6240675a: add Bugly: 邓小涛
16:20 修订 516c4b83: update: ZhouGang
15:43 修订 235bb869: *修改角色选择界面: cloud
15:40 修订 944769df: no message: luh
15:38 修订 0084e605: no message: 张张涛
15:27 修订 b6d55ab8: Merge branch 'develop_native' of rm.runfox.com:root/rf_runfox_h5 into develop_native: leen
15:26 修订 74968e63: a: leen
15:17 修订 8d837f38: no message: 张张涛
15:03 修订 464df8d5: Merge branch 'develop_native' of http://rm.runfox.com/gitlab/root/rf_runfox_h5 into ...: 张张涛
15:03 修订 dac3f269: 删除 skip: 张张涛
15:03 修订 cca24137: lll: 邓小涛
14:46 修订 44eec91a: 配置更新: 张张涛
14:41 修订 e5152a99: 热更新调整: ZhouGang
14:35 修订 47c583fb: Merge branch 'develop_native' of rm.runfox.com:root/rf_runfox_h5 into develop_native: ZhouGang
14:35 修订 2fd28de3: 更新main.js: ZhouGang
14:22 修订 48c9d93f: a: leen
14:17 修订 7c574031: 衣柜冰箱: leen
12:08 修订 4e2e40f9: Merge branch 'develop_native' of rm.runfox.com:root/rf_runfox_h5 into develop_native: cloud
12:07 修订 e693368c: *修改背景色设置: cloud
12:06 修订 bb6d18ad: Merge branch 'develop_native' of rm.runfox.com:root/rf_runfox_h5 into develop_native: ZhouGang
12:05 修订 e3c6a272: 修改课程结算bug: ZhouGang
12:00 修订 e475aa5a: Merge branch 'develop_native' of rm.runfox.com:root/rf_runfox_h5 into develop_native: 邓小涛
12:00 修订 997ea57a: commit bug: 邓小涛
11:41 修订 67022e5e: *移掉语音引擎初始化: cloud
11:33 修订 3be69af4: no message: luh
11:09 修订 71d96fd0: 解决课程中角色错误问题: ZhouGang
10:18 修订 b0f1e8d6: 衣柜冰箱快速点击物品消失的bug: leen

2019-01-11

21:58 修订 829940af: Merge branch 'develop_native' of rm.runfox.com:root/rf_runfox_h5 into develop_native: 邓小涛
21:57 修订 8214390f: commit: 邓小涛
21:55 修订 4a8d5347: Merge branch 'develop_native' of http://rm.runfox.com/gitlab/root/rf_runfox_h5 into ...: 张张涛
21:55 修订 72a4bd63: Merge branch 'develop_native' of http://rm.runfox.com/gitlab/root/rf_runfox_h5 into ...: 张张涛
21:53 修订 51e3492e: Merge branch 'develop_native' of rm.runfox.com:root/rf_runfox_h5 into develop_native: 邓小涛
21:53 修订 fdd91dbf: commit: 邓小涛
21:50 修订 ede39d87: 勾选自动释放场景资源: 张张涛
21:47 修订 f63efd14: 更新热更新: ZhouGang
21:40 修订 24620ee7: no message: luh
21:23 修订 b43ebe42: Merge branch 'develop_native' of rm.runfox.com:root/rf_runfox_h5 into develop_native: leen
21:22 修订 c3639ccc: 编辑模式冰箱衣柜: leen
21:08 修订 f53b6999: commit: 邓小涛
20:50 修订 26a7d2f1: Merge branch 'develop_native' of http://rm.runfox.com/gitlab/root/rf_runfox_h5 into ...: 张张涛
20:50 修订 fe4861bb: no message: 张张涛
20:48 修订 1dcad440: Merge branch 'develop_native' of http://rm.runfox.com/gitlab/root/rf_runfox_h5 into ...: luh
20:48 修订 84537ccd: no message: luh
20:46 修订 2d339c71: 添加评测6秒超时: 张张涛
20:40 修订 8e024d01: no message: luh
20:39 修订 6ff869d1: Merge branch 'develop_native' of http://rm.runfox.com/gitlab/root/rf_runfox_h5 into ...: luh
20:39 修订 d94af892: no message: luh
20:35 修订 983bc6fe: 修改电磁加载动画: JaneSnow
20:14 修订 f76c6e65: Merge branch 'develop_native' of http://rm.runfox.com/gitlab/root/rf_runfox_h5 into ...: JaneSnow
20:14 修订 d4379baf: 新增启动视频前的加载动画: JaneSnow
19:30 修订 b0197c89: no message: luh
18:51 修订 59b39e35: 热更新修复: ZhouGang
18:35 修订 70d98167: no message: 张张涛
18:31 修订 8ce38a15: Merge branch 'develop_native' of rm.runfox.com:root/rf_runfox_h5 into develop_native: 邓小涛
18:31 修订 cdb2d0ef: commit laucnchScreen: 邓小涛
18:20 修订 743f7939: no message: 张张涛
18:17 修订 394a4ab8: no message: 张张涛
18:08 修订 d294500f: Merge branch 'develop_native' of rm.runfox.com:root/rf_runfox_h5 into develop_native: 邓小涛
18:08 修订 67942a7d: commit: 邓小涛
18:00 修订 6f5f8b8e: no message: luh
17:57 修订 21708c5f: no message: 张张涛
17:42 修订 5321348d: add bg audio: luh
17:30 修订 adccb514: Merge branch 'develop_native' of rm.runfox.com:root/rf_runfox_h5 into develop_native: 邓小涛
17:30 修订 8f894ee2: commit loading: 邓小涛
17:25 修订 378f9bf5: no message: luh
17:24 修订 6b419d8a: 新加资源: 张张涛
17:18 修订 82cae27b: 配置跟新: 张张涛
17:17 修订 14858082: *不学课程不能购买: cloud
17:15 修订 26389cb8: Merge branch 'develop_native' of rm.runfox.com:root/rf_runfox_h5 into develop_native: 邓小涛
17:15 修订 f352d645: commit: 邓小涛
17:09 修订 4a71a141: *清空色设置为黑色: cloud
17:07 修订 6b091dee: *默认清空色为白色: cloud
16:57 修订 094cb755: 点击同一个物品时瓶子不在重复说话: 张张涛
16:47 修订 e7210003: Merge branch 'develop_native' of http://rm.runfox.com/gitlab/root/rf_runfox_h5 into ...: luh
16:47 修订 81de9932: fix size bug: luh
16:39 修订 a3d5e937: 更新错误文件名: 张张涛
16:38 修订 59137643: 解决房间里摆放的家具显示的皮肤和获取到的皮肤不一样的BUG: luh
16:34 修订 2fcd5344: *修改注销: cloud
16:33 修订 2b616460: *修改注销: cloud
16:24 修订 53a61127: *添加注销账号: cloud
16:13 修订 a908658d: 删除无用场景: 张张涛
16:08 修订 00053b56: optimize code: luh
15:53 修订 cb2fb7c8: 将精灵\label变灰默认递归变灰所有子节点: 张张涛
15:36 修订 b02a835f: *修改logo: cloud
15:30 修订 762ae9b1: *fix bug: cloud
15:18 修订 68204dd1: Merge branch 'develop_native' of rm.runfox.com:root/rf_runfox_h5 into develop_native: 邓小涛
15:18 修订 d562a110: commit skip button: 邓小涛
15:15 修订 1b06e001: optimize: luh
14:55 修订 83f258e0: Merge branch 'develop_native' of rm.runfox.com:root/rf_runfox_h5 into develop_native: 邓小涛
14:54 修订 821ca28e: commit lunch: 邓小涛
14:54 修订 24ed042d: no message: 张张涛
14:49 修订 d8a776a9: 隐藏房间装扮中的商城和家长端功能: JaneSnow
14:01 修订 ca80a89c: commit: 邓小涛
14:00 修订 d4ac8afe: commit: 邓小涛
13:47 修订 c147a0be: *设置视频框颜色: cloud
12:18 修订 a6e8d961: Merge branch 'develop_native' of http://rm.runfox.com/gitlab/root/rf_runfox_h5 into ...: 张张涛
12:18 修订 787e004e: no message: 张张涛
12:16 修订 114994cf: 家长控制学习课程数 fix BUg: luh
12:05 修订 b20b3f7a: 添加混淆图片: 张张涛
12:00 修订 e46b1149: no message: luh
11:53 修订 c698692d: 删除重复图片: 张张涛
11:50 修订 9b196d80: no message: 张张涛
11:47 修订 c32c77da: Merge branch 'develop_native' of rm.runfox.com:root/rf_runfox_h5 into develop_native: leen
11:47 修订 4bace338: a: leen
11:42 修订 a646a523: commit: 邓小涛
11:12 修订 a61f4267: *优化视频播放: cloud
10:53 修订 3856abfe: no message: 张张涛
10:34 修订 86be272b: update: ZhouGang

2019-01-10

22:20 修订 e3c86700: no message: luh
22:17 修订 b0683cb5: no message: luh
22:10 修订 2aabf664: update version: ZhouGang
22:00 修订 02d34efa: *修改视频前后台切换: cloud
21:42 修订 fd49c7f0: Merge branch 'develop_native' of rm.runfox.com:root/rf_runfox_h5 into develop_native: # Conflicts:
# assets/Script/Scene/StoreScene.ts 邓小涛
21:41 修订 9cf80c58: 音量bug: 邓小涛
21:29 修订 e77bd513: 点击事件穿层: 张张涛
21:19 修订 560f32ac: 更新封面: ZhouGang
20:41 修订 48299f37: *优化商城购买: cloud
20:27 修订 30aa331e: no message: 张张涛
19:51 修订 8b2cfdcc: 解决录音播放问题: ZhouGang
19:44 修订 4a0e64eb: 修改地图课程界面星星层级问题: JaneSnow
19:14 修订 e509b1c1: *修改tag设置bug: cloud
18:57 修订 7e0e7d90: 中文字幕替换名字: ZhouGang
18:52 修订 4c0523e8: Merge branch 'develop_native' of http://rm.runfox.com/gitlab/root/rf_runfox_h5 into ...: 张张涛
18:52 修订 80bb9438: 配置更新: 张张涛
18:50 修订 cae40342: Merge branch 'develop_native' of http://rm.runfox.com/gitlab/root/rf_runfox_h5 into ...: JaneSnow
18:50 修订 9c5c597a: 更换登录文字替换: JaneSnow
18:45 修订 b51fe5c7: 语音回放修复: ZhouGang
18:33 修订 dd394f5e: no message: 张张涛
18:32 修订 e71df735: 瓶子提问音效: 张张涛
18:29 修订 bf6ba9e2: 家具交互音效: 张张涛
18:27 修订 6c899da5: Merge branch 'develop_native' of http://rm.runfox.com/gitlab/root/rf_runfox_h5 into ...: luh
18:26 修订 a83183c4: no message: luh
18:22 修订 1fc4d6e0: no message: 张张涛
18:19 修订 3989e710: Merge branch 'develop_native' of http://rm.runfox.com/gitlab/root/rf_runfox_h5 into ...: JaneSnow
18:19 修订 97df979d: 修改level购买界面左边适配长度: JaneSnow
18:17 修订 fa60f6d2: no message: luh
18:09 修订 621feb61: no message: 张张涛
18:04 修订 413e63f1: 单词卡箱 bug: 张张涛
18:03 修订 f4842107: no message: luh
17:37 修订 5f0bef0b: update: ZhouGang
17:33 修订 2262878f: 加入麦克疯授权资源: ZhouGang
17:27 修订 f1c86849: no message: luh
17:23 修订 e91a990a: *关掉测试代码: cloud
17:04 修订 024c2396: no message: luh
17:02 修订 f1bca303: *添加测试代码: cloud
17:00 修订 cfc8fc6f: Merge branch 'develop_native' of rm.runfox.com:root/rf_runfox_h5 into develop_native: 邓小涛
17:00 修订 1178f352: commit Ads: 邓小涛
16:52 修订 fbfb2dea: *修改商城: cloud
16:34 修订 5dd9f3bf: no message: luh
16:12 修订 1fdb92da: *修改商城购买: cloud
15:29 修订 7e57eb25: no message: 张张涛
15:25 修订 3ea74b5d: joe 引起动画错误问题: 张张涛
15:23 修订 4859a885: no message: luh
15:17 修订 a642deca: 新增两个预制（提示框）好消息提示框和坏消息提示框: JaneSnow
15:11 修订 f87f4306: no message: luh
14:40 修订 981d4bb6: no message: luh
14:24 修订 99f3bc97: 修改地图界面课程文字文字，修改商城界面底板适配: JaneSnow
13:51 修订 5ecc9b0a: Merge branch 'develop_native' of rm.runfox.com:root/rf_runfox_h5 into develop_native: leen
13:51 修订 48fffc8c: 衣柜放置区调整: leen
13:42 修订 1754fd4d: runfoxid: leen
13:34 修订 d7f5d3a1: danny & mia: leen
13:12 修订 9723a22b: 修改商城界面适配问题: JaneSnow
12:26 修订 d0c32443: 家具装备不起作用的bug: leen
12:18 修订 442dea7a: *商城界面跳转: cloud
12:17 修订 afaf70a0: *添加课程包购买: cloud
12:01 修订 1a41d799: no message: luh
11:44 修订 b48590ac: 修改评测通过分，增加评测日志输出: ZhouGang
11:39 修订 ba85fc5f: no message: 张张涛
11:35 修订 c59aac88: Merge branch 'develop_native' of http://rm.runfox.com/gitlab/root/rf_runfox_h5 into ...: JaneSnow
11:33 修订 ad7398c6: 修改地图界面，云问题和文字问题: JaneSnow
11:27 修订 d17fd328: 墙: leen
11:27 修订 e9ea629c: Merge branch 'develop_native' of rm.runfox.com:root/rf_runfox_h5 into develop_native: 邓小涛
11:26 修订 a1750c08: commit a bug cloud: 邓小涛
11:20 修订 ca21f707: 隐藏垃圾桶: leen
11:10 修订 9d0bd39f: *添加触摸层: cloud
10:54 修订 a0922c03: *添加触摸屏蔽: cloud
10:43 修订 b5265141: 更新logo视频，修改icon: ZhouGang
10:38 修订 c06baf29: 修改商城文字问题: JaneSnow
10:21 修订 563f62bb: Merge branch 'develop_native' of rm.runfox.com:root/rf_runfox_h5 into develop_native: ZhouGang
10:21 修订 fda832ab: 修复课程热更新问题，优化课程内存占用，课程中屏幕保持常亮: ZhouGang
10:18 修订 44b88afb: Merge branch 'develop_native' of http://rm.runfox.com/gitlab/root/rf_runfox_h5 into ...: JaneSnow
10:12 修订 00021358: no message: luh
10:06 修订 9c59f9d1: no message: luh
10:05 修订 44e32528: no message: 张张涛
10:04 修订 490b7a5c: *商品购买获取钻石: cloud
09:56 修订 4fd894ea: *登录界面添加loading: cloud
09:44 修订 620d8324: *优化loading: cloud

2019-01-09

04:05 修订 099dd79b: “不同角色相同道具位置的bug”: ”冰箱有些道具不能放上去的bug“ leen
04:01 修订 86ceb912: Merge branch 'develop_native' of rm.runfox.com:root/rf_runfox_h5 into develop_native: leen
00:26 修订 d90add11: no message: 张张涛
23:53 修订 234695b1: Merge branch 'develop_native' of rm.runfox.com:root/rf_runfox_h5 into develop_native: leen
22:57 修订 23c6b812: Merge branch 'develop_native' of http://rm.runfox.com/gitlab/root/rf_runfox_h5 into ...: luh
22:52 修订 4782e68a: 解决抽屉导致GO按钮消失的bug: leen
22:16 修订 41b6a28c: a: leen
22:01 修订 5abfe22e: change bug: 邓小涛
21:05 修订 e614625f: no message: luh
20:49 修订 8c0bfe7d: 上传level购买界面的适配: JaneSnow
20:45 修订 91c609ca: Merge branch 'develop_native' of rm.runfox.com:root/rf_runfox_h5 into develop_native: # Conflicts:
# assets/Script/UI/CardBox/GamePause.ts 邓小涛
20:45 修订 321813a0: commit guanggao: 邓小涛
20:38 修订 3b28c155: no message: luh
20:29 修订 f789664c: *调整适配: cloud
20:25 修订 3f6c650a: 法律声明跳转: 张张涛
20:17 修订 0afb73d7: no message: 张张涛
20:17 修订 ed3837cf: 单词卡图片: 张张涛
20:13 修订 d40f55f8: no message: luh
18:26 修订 56caa501: no message: 张张涛
18:18 修订 4756397f: 增加mia角色配置，修改视频动画: ZhouGang
18:12 修订 5e3497b5: no message: luh
18:02 修订 90cb73d6: no message: luh
17:59 修订 58fe7b18: no message: 张张涛
17:58 修订 b600fd6a: no message: 张张涛
17:57 修订 b6b6427d: no message: 张张涛
17:54 修订 024d7fa4: no message: 张张涛
17:45 修订 24ecaf09: *修改商城购买: cloud
17:42 修订 1d9124f0: 修改卡片游戏冰冻效果: JaneSnow
17:18 修订 d3c33ba4: no message: luh
17:05 修订 e0601e63: *修改商品购买: cloud
16:52 修订 24816206: no message: luh
16:44 修订 c76b6f67: Merge branch 'develop_native' of http://rm.runfox.com/gitlab/root/rf_runfox_h5 into ...: JaneSnow
16:44 修订 2c7eb8ba: 修改地图界面loading动画时间和云遮挡问题: JaneSnow
16:42 修订 e4630538: no message: luh
16:38 修订 6612cb70: no message: luh
16:37 修订 df548a33: 修改购买整个level和商城的物品和价格: JaneSnow
16:10 修订 6f2438bd: Merge branch 'develop_native' of http://rm.runfox.com/gitlab/root/rf_runfox_h5 into ...: luh
16:10 修订 d3f0ab14: FIX bug: luh
16:10 修订 3875e2c5: Merge branch 'develop_native' of rm.runfox.com:root/rf_runfox_h5 into develop_native: ZhouGang
16:09 修订 29cc2554: 更改为高度适配: ZhouGang
16:04 修订 9fe2d65a: no message: luh
16:00 修订 56b92f76: update: ZhouGang
15:58 修订 8627b928: no message: 张张涛
15:42 修订 eb4e0220: Merge branch 'develop_native' of http://rm.runfox.com/gitlab/root/rf_runfox_h5 into ...: JaneSnow
15:42 修订 cf8d5a2b: no message: luh
15:42 修订 46dc85e2: Merge branch 'develop_native' of http://rm.runfox.com/gitlab/root/rf_runfox_h5 into ...: JaneSnow
15:42 修订 c929c5c8: 修改课程结算界面适配问题: JaneSnow
15:34 修订 17ee3e5c: *修改level计划: cloud
15:31 修订 d92dcf5c: no message: luh
15:25 修订 97f3b295: Merge branch 'develop_native' of http://rm.runfox.com/gitlab/root/rf_runfox_h5 into ...: 张张涛
15:25 修订 b465f938: no message: 张张涛
15:24 修订 e01ec829: 调整购买Level介绍的适配问题: JaneSnow
15:11 修订 397e6501: *添加过场动画: cloud
14:58 修订 5ff45bc5: Merge branch 'develop_native' of http://rm.runfox.com/gitlab/root/rf_runfox_h5 into ...: JaneSnow
14:58 修订 7c73664e: 修改课程结算界面（隐藏学习报告分析功能）: JaneSnow
14:57 修订 a72e9bec: *添加过场动画: cloud
14:52 修订 8c5ad900: no message: luh
14:48 修订 4a700edf: Merge branch 'develop_native' of rm.runfox.com:root/rf_runfox_h5 into develop_native: ZhouGang
14:48 修订 24246534: update: ZhouGang
14:46 修订 5d0da8bc: *修改角色名字: cloud
14:41 修订 d36687b1: no message: 张张涛
14:37 修订 42fde698: no message: luh
14:33 修订 c8e5b641: no message: 张张涛
13:16 修订 8dafc2e3: no message: 张张涛
13:15 修订 c5ded89e: no message: 张张涛
13:15 修订 ba65542b: 单词卡箱图片: 张张涛
13:14 修订 c011c023: 单词卡箱bug修复: 张张涛
11:45 修订 dd28da5c: *修改登录界面: cloud
11:32 修订 27bee741: *修改自动登录: cloud
11:03 修订 9377f806: no message: luh
11:03 修订 329d3be1: no message: luh
10:48 修订 54b6961b: 视频播放点击无效: cloud
10:36 修订 ab258482: *优化商城界面: cloud
10:19 修订 c0365ace: *修改商城界面: cloud
10:01 修订 0a112207: *修改商城纹理丢失: cloud
09:59 修订 b1d2f775: *修改商城纹理丢失: cloud

2019-01-08

22:19 修订 f532f35d: 修改卡片界面和地图云: JaneSnow
21:58 修订 0ba5af0a: Merge branch 'develop_native' of http://rm.runfox.com/gitlab/root/rf_runfox_h5 into ...: luh
21:57 修订 ac6baf7c: no message: luh
21:57 修订 d589a967: no message: 张张涛
21:55 修订 f40ea503: Merge branch 'develop_native' of rm.runfox.com:root/rf_runfox_h5 into develop_native: leen
21:55 修订 599e0efa: 抽屉bug: 角色可以在家具后面点击 leen
21:37 修订 b044c96a: Merge branch 'develop_native' of rm.runfox.com:root/rf_runfox_h5 into develop_native: # Conflicts:
# assets/Script/UI/ChangeSceneAnimationUi.meta 邓小涛
21:36 修订 65d10162: commit a: 邓小涛
21:35 修订 d1a462ae: no message: luh
21:30 修订 b9d41318: a: leen
21:24 修订 de307015: 修改家长端适配问题（和隐藏四个功能）: JaneSnow
21:14 修订 91bd08c9: Merge branch 'develop_native' of rm.runfox.com:root/rf_runfox_h5 into develop_native: 邓小涛
21:14 修订 0cd0c2b5: b: 邓小涛
21:13 修订 a8334035: no message: 张张涛
21:08 修订 1af8b0df: no message: luh
21:08 修订 4a6168af: no message: luh
20:57 修订 6acda25e: *去掉点击限制: cloud
20:45 修订 13169c06: Merge branch 'develop_native' of rm.runfox.com:root/rf_runfox_h5 into develop_native: # Conflicts:
# assets/Scene/secne_room.fire 邓小涛
20:45 修订 dbd8e683: b: 邓小涛
20:44 修订 ec98d918: a: leen
20:41 修订 2575a653: Merge branch 'develop_native' of rm.runfox.com:root/rf_runfox_h5 into develop_native: # Conflicts:
# assets/Script/UI/LoadingControll.ts 邓小涛
20:40 修订 275777ff: Merge branch 'develop_native' of rm.runfox.com:root/rf_runfox_h5 into develop_native: ZhouGang
20:39 修订 484cccb9: update: ZhouGang
20:38 修订 422cda57: a: leen
20:38 修订 023ab109: Merge branch 'develop_native' of rm.runfox.com:root/rf_runfox_h5 into develop_native: # Conflicts:
# assets/Scene/secne_room.fire 邓小涛
20:36 修订 e49ad609: commit root: 邓小涛
20:30 修订 aa1af6b2: 用户退出登录: 张张涛
20:28 修订 03ee439d: no message: luh
20:24 修订 2d3f4094: commit skip btn: 邓小涛
20:20 修订 35b5c388: 保存房间数据: 初始化房间数据 leen
19:42 修订 40e63449: no message: 张张涛
19:14 修订 6bbe0f12: *修改点击按钮: cloud
19:12 修订 51cac97f: *去掉多余的控件: cloud
19:10 修订 c13865d8: *退出界面重置数字: cloud
18:59 修订 6fb7d978: no message: luh
18:59 修订 c1b07c52: no message: 张张涛
18:57 修订 cdc1c920: no message: 张张涛
18:49 修订 2a0414b7: Merge branch 'develop_native' of http://rm.runfox.com/gitlab/root/rf_runfox_h5 into ...: 张张涛
18:44 修订 a9bc9bd8: no message: luh
18:38 修订 899abfc6: no message: 张张涛
18:32 修订 71efc482: Merge branch 'develop_native' of rm.runfox.com:root/rf_runfox_h5 into develop_native: # Conflicts:
# assets/Scene/scene_map.fire
# build/jsb-default/frameworks/runtime-src/proj.ios_mac/RunFoxEnglish.xcod... 邓小涛
18:30 修订 1a957a9b: commit MTG ads code: 邓小涛
18:18 修订 8208203a: *同步登录界面: cloud
18:10 修订 95559ecb: Merge branch 'develop_native' of rm.runfox.com:root/rf_runfox_h5 into develop_native: cloud
18:09 修订 821d94af: *修改误操作: cloud
18:04 修订 bae62986: no message: luh
18:03 修订 4041f6b7: *获取设备信息: cloud
17:43 修订 0054e228: *热更新成功跳转登录界面: cloud
17:36 修订 9daa0677: no message: luh
17:23 修订 7f2e022d: Merge branch 'develop_native' of http://rm.runfox.com/gitlab/root/rf_runfox_h5 into ...: luh
17:23 修订 d6678e15: no message: luh
17:23 修订 dddcc2f1: *添加vedioplayer销毁接口: cloud
17:17 修订 88364694: *修改热更新: cloud
16:47 修订 cfba9d00: no message: 张张涛
16:45 修订 222830b7: 修改卡片游戏界面部分新UI: JaneSnow
16:32 修订 99aee0e3: fix hot update bug: luh
16:20 修订 c317a0a8: update: ZhouGang
16:16 修订 e0df4e70: *修改热更新: cloud
15:57 修订 7ffb4e64: Merge branch 'develop_native' of http://rm.runfox.com/gitlab/root/rf_runfox_h5 into ...: 张张涛
15:56 修订 df233289: 单词卡游戏修改: 张张涛
15:47 修订 19599263: *视频播放结束移除控件: cloud
15:45 修订 c035ed0b: *视频播放结束移除控件: cloud
15:08 修订 ef8d2470: Merge branch 'develop_native' of http://rm.runfox.com/gitlab/root/rf_runfox_h5 into ...: # Conflicts:
# assets/Scene/scene_map.fire JaneSnow
15:03 修订 514f6f41: 修改商城界面的图标和适配（修改地图界面的左边云）: JaneSnow
14:42 修订 029b809e: no message: luh
12:24 修订 a4989eba: 修改角色选择界面角色名字: JaneSnow
12:21 修订 5d7a6e9d: 修改课程结算界面新UI: JaneSnow
12:11 修订 576ddad5: Merge branch 'develop_native' of http://rm.runfox.com/gitlab/root/rf_runfox_h5 into ...: JaneSnow
12:11 修订 f55b7d0b: 修改登录界面适配问题和游客登录做明显: JaneSnow
12:08 修订 6064d0b4: no message: luh
11:49 修订 c723679f: 修改房间装扮部分新UI: JaneSnow
11:18 修订 5320f09c: Merge branch 'develop_native' of http://rm.runfox.com/gitlab/root/rf_runfox_h5 into ...: JaneSnow
11:17 修订 e9915d5a: 修改地图界面风格: JaneSnow
10:25 修订 d29bc458: update: ZhouGang
10:21 修订 c61bd8e5: update: ZhouGang
09:56 修订 d0e8c560: no message: luh

2019-01-07

18:06 修订 f70a7b5d: 修改角色选择界面角色名字: JaneSnow
16:32 修订 fd8dd022: Merge branch 'develop_native' of http://rm.runfox.com/gitlab/root/rf_runfox_h5 into ...: JaneSnow
16:31 修订 a86f72f5: 新增卡片游戏暂停界面: JaneSnow
16:25 修订 bbe45ed8: no message: luh
15:56 修订 fbe5fd91: 家长设置界面丢失: 张张涛
15:49 修订 7160a5ed: *修改商城界面适配: cloud
14:38 修订 27bb890b: *添加一个背影层: cloud
14:30 修订 fd13b60c: *添加购买loading加载: cloud
13:02 修订 1271debc: *优化pushscene参数: cloud
12:54 修订 e267b3fa: *去掉表bug: cloud
12:06 修订 e03a4dec: no message: luh
12:04 修订 7cb4dd7c: 新增网络请求动画: JaneSnow
11:17 修订 4dff5efa: Merge branch 'develop_native' of http://rm.runfox.com/gitlab/root/rf_runfox_h5 into ...: 张张涛
11:16 修订 14bef994: 家长控制: 张张涛
11:04 修订 6ce4b7e9: *修改自动登录bug: cloud
11:02 修订 43b8daf0: 口水气泡: 张张涛
10:59 修订 10a4b0b8: Merge branch 'develop_native' of rm.runfox.com:root/rf_runfox_h5 into develop_native: 邓小涛
10:59 修订 5ffec7a6: commit crack: 邓小涛
10:47 修订 18eede75: *添加漏单补单功能: cloud

2019-01-05

18:35 修订 94bbe74f: Merge branch 'develop_native' of rm.runfox.com:root/rf_runfox_h5 into develop_native: 邓小涛
18:35 修订 ab0501d6: commit keen bug: 邓小涛
18:32 修订 1eb98e68: no message: luh
18:30 修订 c9018ce9: no message: luh
18:27 修订 842cb5da: 修改地图界面地图左右滑动两边的云: JaneSnow
18:09 修订 5b4df0d4: Merge branch 'develop_native' of http://rm.runfox.com/gitlab/root/rf_runfox_h5 into ...: luh
18:08 修订 0a4b3d91: no message: luh
18:05 修订 6e8b023a: *恢复订单: cloud
18:00 修订 8cc0a5c6: Merge branch 'develop_native' of http://rm.runfox.com/gitlab/root/rf_runfox_h5 into ...: JaneSnow
18:00 修订 44c5ec66: 新增地图Loading界面，修改level预售的云: JaneSnow
17:58 修订 4a6ab6d1: 部分家具不更新层级: leen
17:41 修订 b01f4958: Merge branch 'develop_native' of rm.runfox.com:root/rf_runfox_h5 into develop_native: # Conflicts:
# assets/Script/UI/MicroPhone/MicrophoneUI.ts 邓小涛
17:40 修订 220c97b3: commit change scece: 邓小涛
17:35 修订 506a168f: *通过组件方式实现不能连点: cloud
17:32 修订 590acc7a: Merge branch 'develop_native' of rm.runfox.com:root/rf_runfox_h5 into develop_native: leen
17:31 修订 07edc928: a: leen
17:29 修订 46c77e5a: *禁止连续点击: cloud
17:02 修订 731b766e: 悬挂物品增加两种动画效果: leen
16:57 修订 5dbbe04e: no message: 张张涛
16:55 修订 86c1eeae: no message: 张张涛
16:25 修订 2f102cf0: 增加结算功能: ZhouGang
16:21 修订 7c64b91c: no message: 张张涛
15:59 修订 b5cabbef: Merge branch 'develop_native' of rm.runfox.com:root/rf_runfox_h5 into develop_native: 邓小涛
15:59 修订 2ffe1a06: change some jsb bug: 邓小涛
15:08 修订 1c7c83cd: Merge branch 'develop_native' of http://rm.runfox.com/gitlab/root/rf_runfox_h5 into ...: 张张涛
15:07 修订 88604c99: 家长设置改为服务器存储: 张张涛
15:05 修订 746310cd: *允许传空字典: cloud
14:59 修订 7c4717f6: no message: luh
14:40 修订 f06e77c9: *优化语音评测: cloud
14:28 修订 84e53c0d: no message: luh
14:23 修订 d0679c73: *设置评测参数: cloud
14:08 修订 775faa86: *当前课程进度: cloud
12:47 修订 75a345cf: no message: 张张涛
11:53 修订 57dfbe82: a: leen
11:38 修订 2450e1da: Merge branch 'develop_native' of rm.runfox.com:root/rf_runfox_h5 into develop_native: leen
11:38 修订 c710db16: a: leen
11:37 修订 e844397f: no message: luh
11:35 修订 7d7faff9: no message: 张张涛
11:20 修订 3b809da4: 抽屉: leen
11:09 修订 457d7715: *优化sharesdk调用: cloud
11:08 修订 188d14f0: *优化sharesdk调用: cloud
10:50 修订 03561a7a: Merge branch 'develop_native' of rm.runfox.com:root/rf_runfox_h5 into develop_native: leen
10:49 修订 5dc776de: 角色无法拿比自己大的物体: leen
10:49 修订 b51d59de: Merge branch 'develop_native' of rm.runfox.com:root/rf_runfox_h5 into develop_native: 邓小涛
10:49 修订 78c7407e: config: 邓小涛
10:48 修订 ebdb43a3: update: ZhouGang
10:45 修订 d033534f: 食物拖到冰箱位置，冰箱开门: leen
10:31 修订 53fefd05: a: leen
09:54 修订 4969b2a2: berger: leen

2019-01-04

18:29 修订 3ca20900: a: leen
18:15 修订 2bb1db86: Merge branch 'develop_native' of http://rm.runfox.com/gitlab/root/rf_runfox_h5 into ...: JaneSnow
18:15 修订 beef7d29: 修改地图界面文字问题: JaneSnow
18:13 修订 0a122d30: 放置到指定物品上: leen
17:57 修订 07c3e5c0: 房间界面添加家长设置: 张张涛
17:54 修订 e2b7ac43: Merge branch 'develop_native' of rm.runfox.com:root/rf_runfox_h5 into develop_native: leen
17:54 修订 e31f675e: 放置: leen
17:53 修订 1dad9219: no message: 张张涛
17:47 修订 e94b2efb: Merge branch 'develop_native' of http://rm.runfox.com/gitlab/root/rf_runfox_h5 into ...: 张张涛
17:45 修订 6a807f5c: 地图界面家长端设置: 张张涛
17:45 修订 36672078: *去掉多余头文件: cloud
17:41 修订 e926bfb5: *优化mp3操作: cloud
17:31 修订 e425b1a1: no message: luh
17:26 修订 bca39123: no message: luh
17:13 修订 707d2ad5: no message: luh
16:54 修订 e67a73e4: Merge branch 'develop_native' of http://rm.runfox.com/gitlab/root/rf_runfox_h5 into ...: luh
16:54 修订 c27977d6: no message: luh
16:52 修订 79db34d7: *修改获取设备: cloud
16:26 修订 f592bbf0: 家长设置: 张张涛
16:23 修订 cde8160f: no message: 张张涛
16:13 修订 d0b8d23c: Merge branch 'develop_native' of rm.runfox.com:root/rf_runfox_h5 into develop_native: leen
16:12 修订 4a0e0df2: 悬挂: leen
16:11 修订 992e8fdd: Merge branch 'develop_native' of rm.runfox.com:root/rf_runfox_h5 into develop_native: cloud
16:11 修订 a58e5f8b: *修改支付成功不回调bug: cloud
16:07 修订 68fa5f60: no message: luh
15:29 修订 2095e707: change jsc to sm: 邓小涛
14:59 修订 3969664b: *添加push回调: cloud
14:40 修订 5d5775a6: *修改level购买: cloud
14:19 修订 59b6b2c9: Merge branch 'develop_native' of http://rm.runfox.com/gitlab/root/rf_runfox_h5 into ...: JaneSnow
14:19 修订 823cacb9: 上传新增加一个气泡内容: JaneSnow
14:11 修订 d33db194: *修改level计划购买: cloud
12:19 修订 fd8c32b2: *获取卡包提示: cloud
12:00 修订 a046c6dd: *提示购买不足: cloud
11:54 修订 9fdc2cae: *修改钻石不足: cloud
11:50 修订 befa807d: *购买卡包: cloud
11:32 修订 0d50626c: 上传家长端新增的隐私条款: JaneSnow
11:28 修订 7e242c7d: *已有卡包不在显示: cloud
11:17 修订 7dbcbf0b: *修改卡包获取: cloud
11:11 修订 13f558b5: *获取单词卡包: cloud
10:42 修订 e8e3d2f7: 单词卡箱返回上一个进入的界面: 张张涛
10:30 修订 78254ae4: *修改多次点击: cloud
09:26 修订 13eb88d9: *获取单词卡包相关信息: cloud
09:26 修订 5797f31b: *获取单词卡包相关信息: cloud

2019-01-03

18:10 修订 6e90a166: Merge branch 'develop_native' of http://rm.runfox.com/gitlab/root/rf_runfox_h5 into ...: luh
18:10 修订 e4996d2c: no message: luh
18:06 修订 efc372c3: Merge branch 'develop_native' of rm.runfox.com:root/rf_runfox_h5 into develop_native: leen
18:06 修订 515885f3: 调整地方放置区: leen
17:59 修订 13a4bc40: no message: 张张涛
17:52 修订 aab7436a: ？: leen
17:51 修订 5c833a5d: 从服务器拉取数据: leen
17:47 修订 ab22e2ba: Merge branch 'develop_native' of rm.runfox.com:root/rf_runfox_h5 into develop_native: leen
17:47 修订 f122e320: a: leen
17:28 修订 9fed6170: update: ZhouGang
17:21 修订 2fa2ee27: *不允许多次点击: cloud
16:55 修订 33e487b3: *仅显示微信登录: cloud
16:44 修订 0e37435d: *仅显示微信登录: cloud
16:31 修订 c8526d87: 修改课程卡死问题: ZhouGang
15:37 修订 90e6a8aa: Merge branch 'develop_native' of rm.runfox.com:root/rf_runfox_h5 into develop_native: 邓小涛
15:36 修订 79d4382f: ccc: 邓小涛
15:09 修订 c7f17f6d: Merge branch 'develop_native' of rm.runfox.com:root/rf_runfox_h5 into develop_native: ZhouGang
15:09 修订 1b0a7006: 添加瓶子发声资源: ZhouGang
15:08 修订 2e6929bc: 修改地图课程角色动画适配: JaneSnow
15:00 修订 b736c74a: Merge branch 'develop_native' of rm.runfox.com:root/rf_runfox_h5 into develop_native: cloud
15:00 修订 d5a0604a: *添加停止评测: cloud
14:55 修订 33d68ed6: no message: luh
14:46 修订 87ab380d: *添加保存mp3文件: cloud
14:23 修订 11df0512: *购买前添加家长控制: cloud
12:37 修订 0462f435: *优化预置体: cloud
12:36 修订 fb78ad4c: *修改家长控制界面: cloud
12:18 修订 5e67a052: 又被篡改的地图界面按钮位置，调过又调啊啊啊啊啊: JaneSnow
11:59 修订 848fcde1: *添加家长控制界面: cloud
11:36 修订 cd989c42: no message: luh
09:57 修订 c4372dfc: *修改level购买scrollview: cloud

2019-01-02

18:41 修订 5b3331a2: commit: 邓小涛
18:25 修订 26767ebf: Merge branch 'develop_native' of rm.runfox.com:root/rf_runfox_h5 into develop_native: 邓小涛
18:24 修订 d113c5cc: commit pluginmanager: 邓小涛
18:21 修订 004377e6: no message: luh
18:17 修订 0b2ca09c: update: ZhouGang
18:16 修订 77d07164: 修改粒子特效显示bug优先使用imageData: ZhouGang
18:09 修订 6ab9db32: 瓶子提问: 张张涛
17:54 修订 49332045: *修改课程购买: cloud
17:50 修订 494d7a83: 盘子: leen
17:32 修订 181f1114: 移动食物打开冰箱: leen
17:30 修订 14490376: change some cloud bug cloud crash in ios: 邓小涛
15:51 修订 d674cb6c: *level 计划购买: cloud
15:21 修订 4313e6ad: *ios渠道号为1: cloud
15:12 修订 7347f053: Merge branch 'develop_native' of rm.runfox.com:root/rf_runfox_h5 into develop_native: 邓小涛
15:12 修订 827396a8: commit pbx: 邓小涛
15:10 修订 30c6cbb6: 修改level1课程计划购买的图的尺寸: JaneSnow
15:03 修订 c80c9c02: Merge branch 'develop_native' of http://rm.runfox.com/gitlab/root/rf_runfox_h5 into ...: luh
15:02 修订 a70944e1: no message: luh
14:57 修订 0ad385a1: *去掉dulipcate 界面: cloud
14:41 修订 791fcd7e: *购买成功下发道具: cloud
14:32 修订 8fc84f49: no message: luh
12:24 修订 bea7d279: 最新资源: leen
12:10 修订 78110620: *优化登录过程: cloud
11:43 修订 4630e21c: *优化购买流程: cloud
11:26 修订 90e6c083: no message: luh
11:07 修订 715fb9ed: 加入启动logo页: ZhouGang
11:01 修订 466d5eae: 被替换了编辑的内容，又从新编辑了一次啊啊啊啊啊: JaneSnow

2018-12-29

18:41 修订 34636fb9: 上传钻石商城的四个商品图片: JaneSnow
18:22 修订 e915a7ad: *修改支付: cloud
18:07 修订 1c8fd14c: Merge branch 'develop_native' of rm.runfox.com:root/rf_runfox_h5 into develop_native: # Conflicts:
# assets/resources/roles.meta 邓小涛
18:07 修订 1031a130: commit mata: 邓小涛
18:07 修订 e567e63c: commit script: 邓小涛
17:58 修订 75cf3edc: 替换地图三张图片: JaneSnow
17:50 修订 719e3ada: no message: luh
17:42 修订 e3779908: no message: luh
17:06 修订 62fed24c: no message: 张张涛
16:49 修订 51c923ac: *添加ios订单校验: cloud
16:47 修订 8f11751e: *添加ios工程: cloud
16:45 修订 1caaf3c2: update: ZhouGang
16:33 修订 068c5921: update: ZhouGang
16:31 修订 20c8c8b2: 更换roles为小写: ZhouGang
16:23 修订 c904edf4: Merge branch 'develop_native' of rm.runfox.com:root/rf_runfox_h5 into develop_native: # Conflicts:
# assets/Script/UI/PushInCardScene.ts.meta 邓小涛
16:22 修订 1a1c2f3c: commit: 邓小涛
16:15 修订 bcb31234: Merge branch 'develop_native' of rm.runfox.com:root/rf_runfox_h5 into develop_native: cloud
16:14 修订 ed874dc6: *修改ios购买: cloud
16:13 修订 e0218c22: Merge branch 'develop_native' of http://rm.runfox.com/gitlab/root/rf_runfox_h5 into ...: JaneSnow
16:13 修订 c65e1008: 修改课程进度UI: JaneSnow
16:11 修订 a6e3dd9f: *修改ios购买: cloud
16:01 修订 24353e00: Merge branch 'develop_native' of rm.runfox.com:root/rf_runfox_h5 into develop_native: cloud
16:01 修订 5d735161: *添加购买level: cloud
15:56 修订 6b16d01d: Merge branch 'develop_native' of http://rm.runfox.com/gitlab/root/rf_runfox_h5 into ...: luh
15:56 修订 dfe7331d: no message: luh
15:54 修订 9418443d: *添加level商城: cloud
15:52 修订 74e31a31: no message: luh
15:42 修订 6eef236c: *添加生成订单: cloud
15:41 修订 2fc34fa4: Merge branch 'develop_native' of rm.runfox.com:root/rf_runfox_h5 into develop_native: # Conflicts:
# assets/Scene/scene_map.fire 邓小涛
15:41 修订 68800855: commit: 邓小涛
15:39 修订 2df80f9b: 上传课程进度UI: JaneSnow
15:37 修订 44545efa: *添加生成订单: cloud
15:18 修订 4271e9c1: about result: luh
15:08 修订 5635017f: *修改商城界面: cloud
15:05 修订 3ac7ba84: *修改商城购买: cloud
14:50 修订 1d289c57: 替换登录界面美术图片，并添加图片文字和角色的适配停靠: JaneSnow
14:33 修订 391e283b: Merge branch 'develop_native' of http://rm.runfox.com/gitlab/root/rf_runfox_h5 into ...: JaneSnow
14:33 修订 8b7194c2: 上传家长端设置提示动画: JaneSnow
14:32 修订 a301b4ee: *修改商城购买: cloud
14:15 修订 e7952517: *添加场景跳转: cloud
13:57 修订 bc68e845: *添加购买商品: cloud
13:48 修订 98931267: no message: luh
13:44 修订 dca5ac70: 新增家长端验证和家长端页面: JaneSnow
12:00 修订 7cc15e70: Merge branch 'develop_native' of http://rm.runfox.com/gitlab/root/rf_runfox_h5 into ...: # Conflicts:
# assets/Scene/scene_map.fire JaneSnow
11:53 修订 89e39298: 地图加广告: JaneSnow
11:52 修订 9b05bbc0: add store scene: luh
11:43 修订 723372ea: Merge branch 'develop_native' of http://rm.runfox.com/gitlab/root/rf_runfox_h5 into ...: # Conflicts:
# assets/Scene/scene_map.fire JaneSnow
11:24 修订 7f46d807: 调整课程结算界面移植到课程界面；新增地图界面上广告: JaneSnow
11:11 修订 2588eb90: a: leen
11:09 修订 7154cd93: Merge branch 'develop_native' of rm.runfox.com:root/rf_runfox_h5 into develop_native: # Conflicts:
# build/jsb-default/frameworks/runtime-src/proj.ios_mac/RunFoxEnglish.xcodeproj/project.pbxproj 邓小涛
11:06 修订 ee892a87: commit native: 邓小涛
10:33 修订 663e5191: 衣柜: leen
10:10 修订 a5e45880: *调整ui位置: cloud

2018-12-28

00:16 修订 197e6309: Merge branch 'develop_native' of rm.runfox.com:root/rf_runfox_h5 into develop_native: leen
00:15 修订 498a814e: 多种碰撞区: 风铃可以挂窗户上
贴纸可以贴在冰箱上
花盆里面可以放道具
优化代码 leen
18:51 修订 1719c18a: no message: 张张涛
18:46 修订 96fb92cf: *优化商城: cloud
18:09 修订 9956a8f9: Merge branch 'develop_native' of http://rm.runfox.com/gitlab/root/rf_runfox_h5 into ...: luh
18:09 修订 ab6c2e3b: no message: luh
17:35 修订 0edaec73: *优化login界面: cloud
17:30 修订 ec501a62: *优化分享: cloud
16:57 修订 8239a6ca: *ios 分享完成: cloud
15:55 修订 08ce8e1d: 添加单词卡游戏二阶段: 张张涛
15:31 修订 bdc7197b: no message: luh
15:10 修订 a84f003f: no message: luh
11:48 修订 732dc22b: *添加ios微信登录: cloud
11:07 修订 960dc35d: alter scene_map: luh

2018-12-27

18:42 修订 d42dcd3e: no message: 张张涛
18:07 修订 e61b00d9: ios 微信扫码登录: cloud
15:42 修订 5e9a3b63: 添加服务器时间接口REST.serverTime: ZhouGang
14:58 修订 4f1bdfc5: 修改课程卡片问题，新增课程按钮几个状态: JaneSnow
11:41 修订 2432e245: a: leen
11:38 修订 b82a734f: a: leen
11:29 修订 427502eb: 现在物品被家具挡住也能点击拖动: leen
11:24 修订 7bfe49aa: 过滤掉空白行: 张张涛
11:06 修订 85f93822: 加载csv 接口修改可以指定配置表中那一行作为KEY 默认参数:: 配置表第一行为key 从第二行第一列开始读取: 张张涛
10:17 修订 94be4a15: *动画播放时不可点击: cloud
10:12 修订 d8983f13: 上传卡片包商城，卡片数量: JaneSnow
10:02 修订 184c3599: 路径错误: leen

2018-12-26

18:57 修订 5e74855f: 家具道具加上放置区: leen
18:28 修订 20d67b49: no message: 张张涛
18:12 修订 e1786bef: no message: 张张涛
18:06 修订 103c83ce: *修改商城界面: cloud
18:00 修订 16d50860: 修改box2d 引擎上可能导致意外崩溃的 bug，: 邓小涛
17:37 修订 052d7caa: *修改商城界面: cloud
17:34 修订 9343cc6c: 动画间隔音效: 张张涛
17:14 修订 8f9fa81e: 修改单词包商城界面图片: JaneSnow
16:45 修订 47f1b810: *修改商城界面: cloud
16:42 修订 8417a092: no message: luh
16:08 修订 cc8321ea: 卡片箱游戏 UI 适配: 张张涛
15:50 修订 1c1b678c: a: leen
12:12 修订 d9889a32: 加入2.1倍宽屏模拟器，修改默认延时bug,修改动作循环bug: ZhouGang
11:55 修订 caac5c16: 碰撞区调整: leen
11:20 修订 ff5777d2: *钻石获取: cloud
11:09 修订 64a36e20: *修改三方登录ios参数: cloud
10:55 修订 64a33cc0: *获取金币和钻石数量: cloud
10:46 修订 d3433297: *优化商城界面: cloud
10:12 修订 51d290e3: *优化扫码登录界面: cloud
10:04 修订 701f0805: *完成微信扫码登录: cloud

2018-12-25

18:34 修订 586a41b4: *修改网络接口位置: cloud
18:33 修订 1bf6831f: 房间瓶子气泡bug修复: 张张涛
16:49 修订 2f703bfe: 单词卡字体大小调整: 张张涛
16:33 修订 50d46140: *扫码登录，底层修改: cloud
16:30 修订 947e95e1: *添加微信扫码登录: cloud
15:40 修订 a1df52fa: no message: 张张涛
15:35 修订 50e997b2: 单词卡游戏: 张张涛
14:46 修订 fa0d92b5: 85% furniture shore: luh
12:02 修订 49b968d8: no message: luh
11:35 修订 c7ede4f3: 房屋道具点击不用冒泡: 道具里面放道具 leen
11:05 修订 6c41a93b: 调整房间装扮动画: JaneSnow

2018-12-24

18:45 修订 fc91a6b8: 上传地图课程几个购买条件，切换level预售等功能: JaneSnow
18:17 修订 e8f55fdc: Merge branch 'develop_native' of rm.runfox.com:root/rf_runfox_h5 into develop_native: leen
18:16 修订 dbdc1870: furniture store: luh
18:06 修订 9ebbf2f3: Merge branch 'develop_native' of rm.runfox.com:root/rf_runfox_h5 into develop_native: ZhouGang
18:05 修订 4e693a6c: 完成selectmulti功能，修改评测显示功能，修改RoleController碰撞框问题: ZhouGang
18:01 修订 8eff94f8: no message: luh
17:57 修订 e36eeba6: 获取家具节点接口: leen
17:50 修订 b0ff9102: 新增整个level课程购买界面: JaneSnow
17:04 修订 97711d66: a: leen
16:46 修订 0321c4a6: *商城界面优化: cloud
16:38 修订 c6518584: 优化代码: leen
16:10 修订 68c82440: *添加商城界面: cloud
12:32 修订 ea9ac9ad: 修改数据存取: cloud
12:22 修订 029639d2: *添加pushScene ,popScene: cloud
12:06 修订 5512d3df: 新增卡片箱功能: JaneSnow
11:19 修订 7e837131: roomItem都有容器的概念: leen
10:25 修订 760820f8: a: leen
10:08 修订 b49fc7d5: *添加测试账号: cloud
09:58 修订 bfa311ce: *更新登录界面: cloud

2018-12-23

18:08 修订 e4af6015: 重新规划层级: leen
18:07 修订 511b5827: 层级改动: leen
18:07 修订 fc64a2d7: 冰箱衣柜里面道具可以点穿的bug: leen
18:06 修订 9ca11606: a: leen

2018-12-22

00:48 修订 1dcf056d: png道具锚点设为0.5，0: leen
00:35 修订 9a9c331a: 容器动态zorder: leen
00:34 修订 0b19f641: Merge branch 'develop_native' of rm.runfox.com:root/rf_runfox_h5 into develop_native: leen
18:51 修订 96334273: Merge branch 'develop_native' of http://rm.runfox.com/gitlab/root/rf_runfox_h5 into ...: JaneSnow
18:51 修订 a8e80cb6: 上传登录界面微信扫码: JaneSnow
18:33 修订 974fc0bb: *修改facebook参数: cloud
18:25 修订 f8c20cce: 卡箱游戏功能完整版 **模拟数据: 张张涛
18:02 修订 3f473551: 奇葩bug奇葩解决: leen
18:00 修订 403a3f5c: a: leen
17:50 修订 3021f83c: 角色最低位置: leen
17:13 修订 ae959309: *添加微信分享: cloud
17:05 修订 d8881810: Merge branches 'develop_native' and 'develop_native' of rm.runfox.com:root/rf_runfox...: leen
17:05 修订 d5bd8182: 刚体不再是同一个父节点，解决遮挡问题: leen
16:59 修订 4161428d: 卡片小游戏: 张张涛
16:44 修订 72fcec11: 新增钻石卡片购买商城界面: JaneSnow
11:46 修订 089d766d: *添加点击音效: cloud
11:45 修订 2241a713: *选择角色上传服务器: cloud
11:34 修订 1dc5235b: 房间装扮家具装扮排查是否动画问题，新增同一个动画: JaneSnow
11:22 修订 9a6cfa4e: *添加点击音效: cloud
10:56 修订 a6d44848: *添加选择角色: cloud
10:32 修订 971ec5dc: *恢复使用角色: cloud
10:02 修订 8ae537d4: *登录时添加unionID: cloud
09:43 修订 6cfa104a: *自动登录失败后显示登录按钮: cloud

2018-12-21

18:32 修订 3d19e71a: *修改本地数据存储: cloud
17:27 修订 cb5f5a5c: *修改登录: cloud
17:15 修订 de567f5d: 清理课程资源，增加拖动功能，增加场景模式: ZhouGang
17:07 修订 569f30c3: *修改自动登录: cloud
15:54 修订 e02cc4d5: playerDB接口调整: 张张涛
15:40 修订 7a09dc26: Merge branch 'develop_native' of http://rm.runfox.com/gitlab/root/rf_runfox_h5 into ...: JaneSnow
15:40 修订 6ced26ab: 新增卡片游戏结算界面: JaneSnow
15:39 修订 9f07d73d: *修改playerDB: cloud
15:08 修订 2a16ce26: *添加角色数据: cloud
14:22 修订 7dd2284c: *添加角色数据: cloud
13:59 修订 46437f42: *修改微信参数: cloud
13:45 修订 f7334b3e: 上传房间装扮，家具商城购买: JaneSnow
13:31 修订 9b7ac26e: *替换微信id: cloud
13:16 修订 d7feb681: 解决抽屉边缘可以放道具的问题: leen
12:54 修订 e179e694: 衣柜、冰箱开关门物品的显示隐藏动画: leen
12:19 修订 7a490414: *调整登录界面适配: cloud
12:13 修订 8f83741f: 新增冰箱购买食物界面: JaneSnow
11:49 修订 8745b83e: *修改登录界面: cloud
10:27 修订 7b05d5e9: 替换登录界面: cloud
10:25 修订 aac41628: a: leen
10:19 修订 416551ef: a: leen
10:14 修订 7e6f9363: *修改常数定义: cloud
09:59 修订 65f25be9: *修改登录消息返回: cloud
09:52 修订 c86fcee3: a: leen

2018-12-20

18:43 修订 9d49619f: 上传登录界面资源: JaneSnow
18:39 修订 e5ebca53: bug: leen
18:26 修订 62ecfe40: Merge branch 'develop_native' of rm.runfox.com:root/rf_runfox_h5 into develop_native: leen
18:26 修订 6b004f4e: bug些: leen
18:01 修订 33bdcfa6: TAG. 上版本取消拖动放置物品功能: luh
17:59 修订 530cd3fe: no message: luh
17:22 修订 a7383daf: *添加shareSDK: cloud
17:19 修订 c1bcfcff: 选择错误重置 combo: 张张涛
17:14 修订 ea42f991: no message: 张张涛
17:12 修订 db82724f: 卡片箱: 张张涛
16:40 修订 dba84eea: no message: luh
15:45 修订 58bf0d4f: no message: luh
12:08 修订 16124165: 不需要这个了: leen
11:44 修订 5d0d00cb: a: leen
11:42 修订 a2c3a073: 解决气泡第一帧闪烁问题，修改模拟器可写目录为Documents下: ZhouGang
11:33 修订 d249bff9: Merge branch 'develop_native' of http://rm.runfox.com/gitlab/root/rf_runfox_h5 into ...: JaneSnow
11:32 修订 7c5a2eed: 修改充能图标切换: JaneSnow
11:31 修订 bee26bc2: 编辑模式: leen
11:26 修订 e60f41b9: no message: 张张涛
11:17 修订 c59ec207: no message: luh
10:10 修订 e3ec3602: a: leen
10:10 修订 ce829ae2: 真机碰撞区没有及时更新的bug: leen

2018-12-19

18:07 修订 feb43643: no message: luh
18:02 修订 e1a62244: 调整图片的默认放置区: leen
17:45 修订 47b694cc: no message: luh
17:35 修订 1c86124e: Merge branch 'develop_native' of rm.runfox.com:root/rf_runfox_h5 into develop_native: leen
17:34 修订 d46497a7: 物品跟着抽屉运动: leen
17:07 修订 9d22161b: 倒计时321天假帧事件: JaneSnow
16:56 修订 a21e58f7: 卡片箱小游戏: 张张涛
15:55 修订 ca84cc74: 抽屉动画: leen
14:50 修订 025a8c58: 工程配置ios: leen
14:39 修订 0f6a8897: 解决真机上父节点移动，子节点刚体不会跟着移动的bug: leen

2018-12-18

16:23 修订 0220f658: 加入模拟器，替换creator模拟器: ZhouGang
15:37 修订 9980be32: a: leen
14:52 修订 624b6a68: 两个抽屉: 场景上移 leen
14:49 修订 44dd8fd6: *修改初始化shareSDK方法名: cloud
14:44 修订 98e894ba: *修改android登录: cloud
12:24 修订 dc13f4d3: 上传卡片游戏部分音效: JaneSnow
11:53 修订 834f1b33: 上传卡片箱界面和卡片游戏: JaneSnow
11:48 修订 29ef7bfa: *修改登录返回: cloud
11:47 修订 fa50d248: *修改用户登录: cloud
11:39 修订 8606c0a8: Utils.performWithDelay: 刚体影响适配的问题 leen
11:33 修订 90082790: no message: luh
10:10 修订 93ee0084: *header设置必须在open之后: cloud

导出 Atom