项目

一般

简介

活动

从 2019-01-04 到 2019-02-02

2019-02-02

19:08 修订 678d3bb2: 修改移动问题
ZhouGang
18:45 修订 019a7ece: *修改商城
cloud
18:32 修订 ec663890: Merge branch 'develop_native' of rm.runfox.com:root/rf_runfox_h5 into develop_native
ZhouGang
18:31 修订 65084ea5: 修改背景音量调节
ZhouGang
18:30 修订 7898d2ac: no message
张 张涛
18:02 修订 5c4c6c20: *修改评测卡死
cloud
17:43 修订 c2c36b7d: 修改课程暂停界面背景音乐
JaneSnow
17:08 修订 3b3616d0: *修改回调
cloud
16:55 修订 80ab8873: update
ZhouGang
16:14 修订 7a1b3340: *修改视频播放
cloud
14:33 修订 5a9a471d: no message
luh
14:22 修订 3e5d4699: a
leen
14:19 修订 63bfa4bd: bug
leen
14:12 修订 4b9c704c: 加入背景音量控制
ZhouGang
13:57 修订 3d83edb7: 后台切换到前台 视频重新播放
张 张涛
13:57 修订 a89aab1b: no message
张 张涛
11:42 修订 99a7efb6: no message
luh
11:26 修订 ff772366: Merge branch 'develop_native' of rm.runfox.com:root/rf_runfox_h5 into develop_native
邓小涛
11:26 修订 e26ea066: commit
邓小涛
11:24 修订 bb63fc63: Merge branch 'develop_native' of http://rm.runfox.com/gitlab/root/rf_runfox_h5 into ...
JaneSnow
11:24 修订 8a41d0c0: 课程暂停界面添加设置背景音乐功能
JaneSnow
11:10 修订 1d9fbacf: *判断是否为json
cloud
10:23 修订 c1de3b97: 修复气泡不存在时卡死问题
ZhouGang

2019-02-01

19:27 修订 50382487: no message
luh
18:48 修订 fbd49a34: update
ZhouGang
18:38 修订 a71e3704: 解决动画缺失问题
ZhouGang
18:34 修订 380deb73: no message
张 张涛
18:33 修订 f0e3e5e7: no message
luh
18:25 修订 1f6bc4a1: no message
luh
18:12 修订 dd2a24e9: no message
luh
18:01 修订 1e13ba05: Merge branch 'develop_native' of http://rm.runfox.com/gitlab/root/rf_runfox_h5 into ...
张 张涛
18:01 修订 bfb27841: 家长设置 切换角色 增加客服
张 张涛
18:01 修订 5328161d: no message
luh
17:58 修订 dd149efd: no message
luh
17:17 修订 770be293: 床、开的灯、沙发触控面积太大的问题
leen
16:37 修订 2e6e9a28: Merge branch 'develop_native' of http://rm.runfox.com/gitlab/root/rf_runfox_h5 into ...
张 张涛
16:36 修订 e38ad453: 单词卡箱 重新排序、扩展卡片提示
张 张涛
16:36 修订 886e1a32: 家长端添加客服功能
JaneSnow
16:13 修订 b8a0ab7e: no message
张 张涛
16:09 修订 013d65a7: Merge branch 'develop_native' of http://rm.runfox.com/gitlab/root/rf_runfox_h5 into ...
JaneSnow
16:09 修订 8fe449dc: 地图界面添加礼包和五星好评
JaneSnow
15:00 修订 24cb5271: fix:单词卡第二阶段角色名出现小写
张 张涛
14:46 修订 00a54bb9: 中文辅助
张 张涛
14:44 修订 4b91f0ab: 打开中文辅助
张 张涛
12:58 修订 0ba66c36: no message
张 张涛
12:57 修订 ed69472f: fix:网络不好会一直游戏的bug
张 张涛
11:52 修订 00fe30ea: no message
张 张涛
11:49 修订 519c7b50: 是否关闭广告
张 张涛
09:44 修订 516cf9e8: *修改广告设置
cloud
09:39 修订 166bc8fb: *修改广告设置
cloud

2019-01-31

05:00 修订 c8391705: a
leen
17:52 修订 495fea6c: no message
luh
17:47 修订 0aa7c040: *修改文字提示
cloud
17:40 修订 ade7067a: *修改商城点穿
cloud
17:19 修订 39bec157: Merge branch 'develop_native' of http://rm.runfox.com/gitlab/root/rf_runfox_h5 into ...
luh
17:19 修订 3ca3e2be: no message
luh
17:12 修订 c5a4b5ca: Merge branch 'develop_native' of rm.runfox.com:root/rf_runfox_h5 into develop_native
ZhouGang
17:12 修订 aa1b21fd: ios 麦克疯权限提示
ZhouGang
17:10 修订 32d2874c: no message
luh
17:08 修订 fd2865c0: no message
luh
16:58 修订 2d98751b: Merge branch 'develop_native' of rm.runfox.com:root/rf_runfox_h5 into develop_native
# Conflicts:
# assets/Script/defines.ts
邓小涛
16:58 修订 db8eee8c: commit iOS 配置
邓小涛
16:54 修订 91ba1449: Merge branch 'develop_native' of rm.runfox.com:root/rf_runfox_h5 into develop_native
cloud
16:53 修订 1ad5ebfe: *修改选择角色
cloud
16:50 修订 8166f8bc: Merge branch 'develop_native' of rm.runfox.com:root/rf_runfox_h5 into develop_native
ZhouGang
16:49 修订 c41795fc: 打开广告页面
ZhouGang
16:44 修订 e0bab3e1: *统计活动
cloud
16:19 修订 adb22eff: *修改分享统计
cloud
15:48 修订 d02d469a: *修改商城界面
cloud
15:47 修订 ef7c7228: Merge branch 'develop_native' of rm.runfox.com:root/rf_runfox_h5 into develop_native
ZhouGang
15:47 修订 5a161f60: update
ZhouGang
15:46 修订 ae854b9b: *统计口令红包
cloud
15:30 修订 dcaf6fa9: no message
luh
15:28 修订 cd83fa62: *统计购买
cloud
15:13 修订 8ea5f0e0: *进入商城统计
cloud
15:12 修订 ed8cff45: Merge branch 'develop_native' of http://rm.runfox.com/gitlab/root/rf_runfox_h5 into ...
JaneSnow
15:12 修订 d96f6aa6: 上传最新口令红包海报
JaneSnow
15:10 修订 3d754fb5: a
leen
15:08 修订 f27b39b6: 统计选择角色
cloud
15:02 修订 d16f23d6: *统计登录事件
cloud
14:50 修订 b4595efa: no message
ZhouGang
14:49 修订 e30a36f6: 修复中文辅助黑边问题
ZhouGang
14:48 修订 1f48deff: 房间神策事件
leen
12:17 修订 badd12ac: 金币
leen
12:03 修订 53558d47: a
leen
12:02 修订 2053ce5c: no message
luh
11:23 修订 1c1d5417: *修改单词包刷新
cloud
10:37 修订 0e6280a4: no message
luh
10:30 修订 955bddde: 上传口令红包分享海报
JaneSnow
10:14 修订 0bec02e7: no message
luh

2019-01-30

18:32 修订 02d9f457: bug
leen
18:25 修订 2065c4cb: no message
luh
18:20 修订 6547b0c9: no message
luh
17:35 修订 f2da0bb9: *修改商城显示
cloud
17:28 修订 161687b6: no message
luh
17:12 修订 a75ea7bd: Merge branch 'develop_native' of rm.runfox.com:root/rf_runfox_h5 into develop_native
邓小涛
17:12 修订 56bae531: commit
邓小涛
17:11 修订 600869ab: no message
luh
17:04 修订 339209b4: no message
luh
16:54 修订 8eaaf06c: 窗户外多种景色
leen
16:38 修订 74c01435: no message
luh
16:23 修订 757cf0c6: 优化食物商城代码
leen
15:42 修订 bce07f55: no message
luh
15:25 修订 993d1557: *注销微信
cloud
14:52 修订 efc182bb: no message
luh
14:38 修订 07aa982c: Merge branch 'develop_native' of rm.runfox.com:root/rf_runfox_h5 into develop_native
ZhouGang
14:38 修订 acf8a0a2: update
ZhouGang
14:37 修订 6cc3dc04: Merge branch 'develop_native' of rm.runfox.com:root/rf_runfox_h5 into develop_native
邓小涛
14:37 修订 9aa02a63: commit ads
邓小涛
14:29 修订 0a1823d7: Merge branch 'develop_native' of http://rm.runfox.com/gitlab/root/rf_runfox_h5 into ...
luh
14:28 修订 8a31a9f1: Merge branch 'develop_native' of rm.runfox.com:root/rf_runfox_h5 into develop_native
leen
14:28 修订 2a616d5c: no message
luh
14:28 修订 a9832898: no message
luh
14:27 修订 734be922: Merge branch 'develop_native' of http://rm.runfox.com/gitlab/root/rf_runfox_h5 into ...
luh
14:23 修订 b3ed9ee7: 配置表
leen
14:22 修订 d1c95733: no message
luh
13:55 修订 2303cd3b: 解决callstatic不回调问题
ZhouGang
12:29 修订 4b8043b7: *取消时间限制
cloud
12:12 修订 edd156e8: *修改口令红包
cloud
11:47 修订 410e0871: 修改卡片游戏,时钟上数字太靠下问题
JaneSnow
11:22 修订 eb7c153d: 卡片箱结算界面返回按钮适配问题
JaneSnow
10:59 修订 cfc7e773: *添加初始化回调
cloud
10:46 修订 54cbf38d: *修改语音引擎
cloud
10:39 修订 0c4a936d: Merge branch 'develop_native' of rm.runfox.com:root/rf_runfox_h5 into develop_native
cloud
10:38 修订 741990f7: *修改语音引擎库
cloud
10:35 修订 8962bfcc: 卡片箱结算界面适配
JaneSnow

2019-01-29

22:00 修订 949adbdc: Merge branch 'develop_native' of rm.runfox.com:root/rf_runfox_h5 into develop_native
# Conflicts:
# build/jsb-default/frameworks/runtime-src/proj.android-studio/app/libs/KeenASR.aar
邓小涛
22:00 修订 cae3da9e: commit
邓小涛
21:52 修订 cc0563c3: *修改评测时间
cloud
21:44 修订 57e386e0: no message
luh
20:57 修订 48d1541c: no message
luh
20:54 修订 faf02b3b: no message
luh
20:36 修订 13fd567d: bug
leen
19:23 修订 9c234235: 点击房间可以关闭食物商城
leen
19:07 修订 5bb25d68: *修改测试参数
cloud
18:29 修订 eccf0a74: 灯位置
leen
17:55 修订 c673c0da: a
leen
17:53 修订 ee24dcab: bug
leen
17:52 修订 a2481a6a: 调整卡片箱按钮适配
JaneSnow
17:47 修订 e714affe: Merge branch 'develop_native' of http://rm.runfox.com/gitlab/root/rf_runfox_h5 into ...
JaneSnow
17:46 修订 576616b2: 运行结算按钮在,真机不在
JaneSnow
17:40 修订 024a3105: 灯音效
leen
17:32 修订 978aa579: Merge branch 'develop_native' of rm.runfox.com:root/rf_runfox_h5 into develop_native
邓小涛
17:31 修订 de628c7d: commit new keen android
邓小涛
17:24 修订 605c91e0: *更换引擎库
cloud
17:20 修订 9774f36d: Merge branch 'develop_native' of http://rm.runfox.com/gitlab/root/rf_runfox_h5 into ...
JaneSnow
17:20 修订 23c5e4b8: Merge branch 'develop_native' of rm.runfox.com:root/rf_runfox_h5 into develop_native
leen
17:20 修订 b457ef70: 修改卡片箱结算界面最高图标到了的问题
JaneSnow
17:20 修订 e687d813: a
leen
17:06 修订 0ed03a47: *修改音效
cloud
17:02 修订 678fc8f8: a
leen
16:50 修订 5f4bc215: a
leen
16:44 修订 c8157ca1: a
leen
16:37 修订 104d8072: 冰箱隐藏钻石栏
leen
16:22 修订 f80c341c: no message
luh
16:18 修订 88ba5919: Merge branch 'develop_native' of http://rm.runfox.com/gitlab/root/rf_runfox_h5 into ...
luh
16:17 修订 e563bf07: no message
luh
16:17 修订 60d87e7f: *修改游戏音效
cloud
16:07 修订 bae5b08c: a
leen
15:59 修订 7e3435cb: no message
luh
15:56 修订 9fd2bf63: Merge branch 'develop_native' of http://rm.runfox.com/gitlab/root/rf_runfox_h5 into ...
JaneSnow
15:55 修订 24e1df83: 动画音效、iPhonex灯
leen
15:55 修订 74e77cd2: Merge branch 'develop_native' of http://rm.runfox.com/gitlab/root/rf_runfox_h5 into ...
JaneSnow
15:55 修订 340703a7: 修改口令红包购买提示文字尺寸
JaneSnow
15:48 修订 47fa8812: no message
luh
15:44 修订 4a81aef3: 评测超时修改
ZhouGang
15:37 修订 7a46a044: *修改重新登录
cloud
15:33 修订 ca8cbf68: *修改语音评测
cloud
15:30 修订 18597c7d: 修改房间装扮界面冰箱按钮位置,修改房间物品购买按钮
JaneSnow
15:09 修订 e6f5cdc0: Merge branch 'develop_native' of rm.runfox.com:root/rf_runfox_h5 into develop_native
# Conflicts:
# build/jsb-default/frameworks/runtime-src/proj.android-studio/app/res/ic_launcher.png
# build/jsb-defau...
邓小涛
15:07 修订 70b5d750: no message
邓小涛
15:06 修订 4da426cc: no message
luh
15:05 修订 fbc4b3d7: 修改商城红包口令的文字“自”和弹窗适配
JaneSnow
15:05 修订 3794113b: commit android icon
邓小涛
14:49 修订 1d70a28e: Merge branch 'develop_native' of http://rm.runfox.com/gitlab/root/rf_runfox_h5 into ...
JaneSnow
14:48 修订 2ede537b: 调整卡片游戏结算界面适配问题
JaneSnow
14:48 修订 a290bf23: 修改中文辅助bug
ZhouGang
14:32 修订 edb0c5a2: 替换之前的方正字体
JaneSnow
12:16 修订 9f1e0c46: Merge branch 'develop_native' of rm.runfox.com:root/rf_runfox_h5 into develop_native
邓小涛
12:08 修订 be62ddc7: no message
luh
12:07 修订 75c8b68f: Merge branch 'develop_native' of rm.runfox.com:root/rf_runfox_h5 into develop_native
# Conflicts:
# assets/Script/Steps/Media.ts
邓小涛
12:04 修订 d6317008: *修改停止回调
cloud
12:01 修订 1dc39429: commit crash bugly Android
邓小涛
11:58 修订 572ccfd3: *修改channel
cloud
11:54 修订 9549f100: no message
luh
11:52 修订 c0d4715e: *修改停止评测
cloud
11:32 修订 b7f9c4dc: no message
luh
11:31 修订 f0a3f958: 更新配置表
ZhouGang
11:14 修订 0dfefb55: 房间往上移动的时候人物、道具不再有景深变化
leen
11:13 修订 e02024bb: update
ZhouGang
10:50 修订 8db53ea6: no message
luh
10:32 修订 5bd06e4f: *修改bug
cloud

2019-01-28

20:44 修订 bcf7b840: 修改评测超时逻辑
ZhouGang
19:39 修订 10bf62fb: update
ZhouGang
18:55 修订 3165f1d4: 加入中文辅助
ZhouGang
18:28 修订 d04d2aec: no message
luh
18:18 修订 0358e0aa: a
leen
18:10 修订 19bd84b0: *更新aar版本
cloud
17:46 修订 dd11c9c5: no message
luh
17:18 修订 84cf462a: bug
leen
16:58 修订 1ad0bdae: *添加微信支付
cloud
16:30 修订 2844b2d7: no message
luh
16:29 修订 f6630a2e: no message
张 张涛
16:15 修订 3fe618fa: a
leen
16:10 修订 4b13eba9: no message
张 张涛
16:04 修订 1b054b7b: no message
luh
15:53 修订 37e7e7bd: no message
张 张涛
15:39 修订 5ba4fb2d: Merge branch 'develop_native' of rm.runfox.com:root/rf_runfox_h5 into develop_native
leen
15:39 修订 aa5d5776: 优化触控方式
leen
15:38 修订 72b6dcc4: 更新扩展单词卡包
heq
15:31 修订 7073d417: fix : 单词游戏第二阶段 出现两个 角色名
张 张涛
15:08 修订 dbb63c60: Merge branch 'develop_native' of http://rm.runfox.com/gitlab/root/rf_runfox_h5 into ...
JaneSnow
15:08 修订 db52bd61: 修改卡片箱结算按钮
JaneSnow
14:58 修订 02089bc3: 单词卡结算界面 显示金币 钻石 fix : 训练模式会修改配置表数据
张 张涛
14:52 修订 495b383a: no message
张 张涛
14:12 修订 973fd06c: no message
张 张涛
14:01 修订 3dad7a9b: *添加sd权限
cloud
13:15 修订 27853fc9: 隐藏facebook
cloud
13:13 修订 218b383b: *修改分享
cloud
12:46 修订 fc45d113: *保存图片到相册
cloud
11:44 修订 78423406: android 保存图片
cloud
11:32 修订 adaf85be: 修改卡片箱游戏,金币双倍和时间静止文字提示和结算界面钻石和金币消耗
JaneSnow
11:06 修订 069ad591: *修改点击穿层
cloud
11:00 修订 15f4d663: *修改商城红包
cloud
10:56 修订 00254a08: *修改红包弹出
cloud

2019-01-26

22:02 修订 8bb68f79: *角色切换
cloud
21:24 修订 c4202f34: *修改商城
cloud
21:18 修订 a5d3dd07: *修改商城
cloud
21:10 修订 a582f4a0: *修改商城bug
cloud
20:45 修订 0a0e4df8: V1.0.1 build 3
ZhouGang
20:42 修订 32a715ca: 改为正式服
ZhouGang
20:36 修订 a660a1a4: *修改商城bug
cloud
20:30 修订 0dba37fe: no message
luh
20:27 修订 badc68e2: course_config
ZhouGang
20:16 修订 609c19cd: Merge branch 'develop_native' of http://rm.runfox.com/gitlab/root/rf_runfox_h5 into ...
JaneSnow
20:15 修订 a64570ef: 调整商城提示文字
JaneSnow
20:12 修订 b351bba1: Merge branch 'develop_native' of rm.runfox.com:root/rf_runfox_h5 into develop_native
邓小涛
20:07 修订 303e86db: Merge branch 'develop_native' of rm.runfox.com:root/rf_runfox_h5 into develop_native
# Conflicts:
# assets/Scene/scene_store.fire
# build/jsb-default/frameworks/runtime-src/proj.ios_mac/ios/Info.plist
邓小涛
20:06 修订 f6e3e38f: V1.0.1 build2
ZhouGang
20:00 修订 186594f2: xxx
邓小涛
20:00 修订 eca03098: defin
邓小涛
19:59 修订 bdf20e58: commit
邓小涛
19:50 修订 cd055afb: no message
luh
19:09 修订 72442f17: update
ZhouGang
19:04 修订 9d3f8e3f: 更新卡片
ZhouGang
18:09 修订 f5395495: V1.0.1 build 2
ZhouGang
17:55 修订 546b2a6c: Merge branch 'develop_native' of rm.runfox.com:root/rf_runfox_h5 into develop_native
cloud
17:55 修订 ff3b3ec4: *修改商城bug
cloud
17:53 修订 1248199d: 更新资源
ZhouGang
17:45 修订 5e59eb82: *修改按钮穿层
cloud
17:42 修订 b255e4df: *修改editbox
cloud
17:35 修订 5853e684: no message
张 张涛
17:24 修订 c1268620: no message
luh
17:22 修订 e5ce9f2c: no message
张 张涛
17:21 修订 e83e586d: no message
luh
17:05 修订 8cb33a8e: 打开指定场景
张 张涛
16:29 修订 73a3c9a9: 修改今日任务文字换行问题,调整课程按钮图片
JaneSnow
16:23 修订 f8ca5a4a: *隐藏分享
cloud
16:13 修订 1302f484: 增加APPLE_REVIEW定义
ZhouGang
16:08 修订 e741a006: 单词卡箱 UI 修改 部分功能修改
张 张涛
15:52 修订 11448669: *修改微信登录
cloud
15:49 修订 1de372fa: 没改
JaneSnow
15:38 修订 d05d6e39: 替换登录界面进度条图片
JaneSnow
15:25 修订 32522751: no message
luh
15:22 修订 da92fb09: no message
luh
15:11 修订 6f93610b: 添加神策事件
luh
14:44 修订 10be039f: Merge branch 'develop_native' of http://rm.runfox.com/gitlab/root/rf_runfox_h5 into ...
# Conflicts:
# assets/Scene/scene_store.fire
JaneSnow
14:41 修订 66bb645f: 修改商城商品详情和二级弹窗的适配问题
JaneSnow
14:34 修订 2f872d4d: *修改口令红包
cloud
14:32 修订 f81eacee: *修改口令红包
cloud
14:24 修订 c8827af9: no message
luh
14:10 修订 ed4c1d53: Merge branch 'develop_native' of rm.runfox.com:root/rf_runfox_h5 into develop_native
leen
14:10 修订 3d46d47f: a
leen
13:16 修订 ac7a111b: *修改口令红包
cloud
13:11 修订 14d6bfca: *修改口令红包
cloud
12:02 修订 a6e47422: 修改今日任务适配和添加宝箱上粒子特效
JaneSnow
11:53 修订 ccdc6723: no message
ZhouGang
11:38 修订 ba62f059: *修改获取口令红包
cloud
11:26 修订 aa9107e5: no message
luh
11:13 修订 82c4dfcc: *修改红包状态切换
cloud
11:06 修订 2d76f9c4: *修改提示消息
cloud
11:03 修订 996a1fa5: *修改通用提示
cloud
11:02 修订 028b665b: *修改通用提示
cloud
10:56 修订 5a763a34: 修改冰冻效果动画
JaneSnow
10:46 修订 94f09537: *修改通用提示
cloud
10:37 修订 75d7301d: *修改分享功能
cloud

2019-01-25

21:56 修订 5c30e021: 修改卡片箱游戏
JaneSnow
20:59 修订 e24084ae: Merge branches 'develop_native' and 'develop_native' of rm.runfox.com:root/rf_runfox...
leen
20:59 修订 f4743244: a
leen
20:58 修订 c0aa6ace: no message
luh
20:47 修订 e2d820e1: Merge branch 'develop_native' of http://rm.runfox.com/gitlab/root/rf_runfox_h5 into ...
luh
20:47 修订 60ae30bd: no message
luh
20:44 修订 62137624: V1.0.3 build 1
ZhouGang
20:40 修订 36423ff1: no message
luh
20:40 修订 eae36567: no message
luh
20:34 修订 f58d5bac: no message
luh
20:23 修订 ff849a18: 瓶子动作
leen
20:17 修订 370887a6: Merge branch 'develop_native' of rm.runfox.com:root/rf_runfox_h5 into develop_native
邓小涛
20:17 修订 b7dbb7bf: commit
邓小涛
20:11 修订 496a8289: no message
luh
20:03 修订 f1b02802: Merge branch 'develop_native' of http://rm.runfox.com/gitlab/root/rf_runfox_h5 into ...
luh
20:03 修订 e29e395e: no message
luh
20:03 修订 aeea51ed: Merge branch 'develop_native' of rm.runfox.com:root/rf_runfox_h5 into develop_native
ZhouGang
20:03 修订 f23c88ff: 解决说话中动作突然切换问题
ZhouGang
20:02 修订 c6b6ba0b: *修改按钮音效
cloud
19:46 修订 4bd6b52a: no message
luh
19:15 修订 44841363: 增加点击音效
heq
19:09 修订 ed5eabcf: *修改保存和分享
cloud
18:31 修订 c4a5f8f3: no message
luh
17:57 修订 863f6b95: 添加部分神策事件
luh
17:48 修订 bc32e19c: Merge branch 'develop_native' of rm.runfox.com:root/rf_runfox_h5 into develop_native
ZhouGang
17:47 修订 a65047d6: update
ZhouGang
17:45 修订 14328bd8: *添加保存到相册
cloud
17:40 修订 23e6c173: Merge branch 'develop_native' of rm.runfox.com:root/rf_runfox_h5 into develop_native
邓小涛
17:39 修订 13432ad4: *添加保存图片到相册
cloud
17:31 修订 57521376: Merge branch 'develop_native' of rm.runfox.com:root/rf_runfox_h5 into develop_native
# Conflicts:
# assets/resources/res/courses/images/mr.png.meta
# assets/resources/res/courses/images/mrs.png.meta
邓小涛
17:30 修订 0a4961fb: commit mate
邓小涛
17:08 修订 62c45e08: no message
张 张涛
17:06 修订 c0d999af: Merge branch 'develop_native' of rm.runfox.com:root/rf_runfox_h5 into develop_native
leen
17:06 修订 990eddbc: a
leen
17:05 修订 f71dfab3: no message
luh
17:04 修订 2f45d38a: ?
leen
17:02 修订 aba0d1fe: *购买添加loading
cloud
16:59 修订 bc6aca56: Merge branch 'develop_native' of rm.runfox.com:root/rf_runfox_h5 into develop_native
# Conflicts:
# assets/Script/defines.ts
邓小涛
16:58 修订 afc027a9: commit ad
邓小涛
16:58 修订 44ecc48a: commit ad change
邓小涛
16:48 修订 48c0585f: 瓶子大小比例
leen
16:48 修订 7037c704: fix:部分头像不显示
张 张涛
16:37 修订 dc85305b: *修改分享功能
cloud
16:30 修订 d784f3b3: Merge branch 'develop_native' of rm.runfox.com:root/rf_runfox_h5 into develop_native
leen
16:29 修订 cb3bcedf: 瓶子里可以放花
leen
16:29 修订 3ffb7bfc: no message
luh
16:16 修订 46817de2: 修改商城适配问题
JaneSnow
15:44 修订 da033ba5: Merge branch 'develop_native' of http://rm.runfox.com/gitlab/root/rf_runfox_h5 into ...
JaneSnow
15:44 修订 2a47b5d8: 修改课程界面中进度调尺寸和颜色和字体问题
JaneSnow
15:43 修订 e02f8058: *修改分享图片
cloud
15:30 修订 ded5ae66: 热更新修复
ZhouGang
15:13 修订 380d784b: update Mr mrs
ZhouGang
14:47 修订 b0454547: Merge branch 'develop_native' of http://rm.runfox.com/gitlab/root/rf_runfox_h5 into ...
JaneSnow
14:46 修订 5db985d7: 修改商城海报分享界面
JaneSnow
14:36 修订 02cc2cc2: no message
张 张涛
11:36 修订 3aacbe7e: Merge branch 'develop_native' of rm.runfox.com:root/rf_runfox_h5 into develop_native
leen
11:35 修订 52152794: 沙发指定位置
leen
11:32 修订 5e2190ed: Merge branch 'develop_native' of http://rm.runfox.com/gitlab/root/rf_runfox_h5 into ...
张 张涛
11:31 修订 bb188859: fix : 选择卡片后 同时播放两个音效BUG
张 张涛
11:28 修订 12ed6a37: Merge branch 'develop_native' of http://rm.runfox.com/gitlab/root/rf_runfox_h5 into ...
luh
11:28 修订 4a241803: no message
luh
11:26 修订 9269e081: no message
张 张涛
11:25 修订 2e8c0006: no message
张 张涛
11:22 修订 0e4be88e: no message
luh
11:16 修订 f4ab83f8: no message
luh
10:53 修订 349e403a: fix :家长设置 课程最大 和 最小后按钮还可点击
张 张涛
10:27 修订 37428218: Merge branch 'develop_native' of http://rm.runfox.com/gitlab/root/rf_runfox_h5 into ...
张 张涛
10:26 修订 407a018f: no message
张 张涛
10:26 修订 c55ae0fc: no message
luh

2019-01-24

18:02 修订 cdddd303: Merge branch 'develop_native' of http://rm.runfox.com/gitlab/root/rf_runfox_h5 into ...
luh
18:02 修订 a929520d: no message
luh
18:01 修订 f7a8143b: no message
张 张涛
17:56 修订 40eb8746: no message
luh
17:33 修订 d9e68fad: 减小提示时间
张 张涛
17:20 修订 4fb8cd1d: no message
luh
16:55 修订 0433ad86: no message
luh
16:38 修订 39d5bd23: 取消TeachScene自动释放资源
ZhouGang
16:35 修订 9c1905c5: 打开神策,设置课程中视频背景为黑色
ZhouGang
16:10 修订 7e38bd53: no message
张 张涛
15:55 修订 d008c871: no message
张 张涛
15:30 修订 69574a5d: 替换点击音效
JaneSnow
15:02 修订 faf49249: bug
leen
14:52 修订 f0fb4abb: 音效
leen
14:30 修订 dc77ee48: Merge branch 'develop_native' of rm.runfox.com:root/rf_runfox_h5 into develop_native
leen
14:30 修订 c7757f40: a
leen
14:26 修订 07d0ce2a: no message
luh
14:22 修订 4a33320d: no message
张 张涛
13:13 修订 042baedf: 衣柜可以放角色
leen
12:59 修订 66905930: ?
leen
12:20 修订 8e8967b7: a
leen
12:13 修订 6f71d628: Merge branch 'develop_native' of rm.runfox.com:root/rf_runfox_h5 into develop_native
leen
12:13 修订 1e77ec78: 光线
leen
12:06 修订 553fd928: no message
luh
11:44 修订 e6cd6675: 修改地图界面热气球图片,删除广告,添加商城图标上一个粒子特效
JaneSnow
11:33 修订 c0866cb8: fix:音频、图片无法显示
张 张涛
10:56 修订 a303cd9f: 回发课程ID 单词卡ID
张 张涛
10:55 修订 d0ce5fc0: *修改商城
cloud
10:49 修订 e58a9896: no message
luh
10:48 修订 c2d41ce2: Merge branch 'develop_native' of http://rm.runfox.com/gitlab/root/rf_runfox_h5 into ...
luh
10:45 修订 5fbe5b40: no message
张 张涛
10:35 修订 ef274ab1: no message
luh
10:18 修订 adbfe118: *修改学习计划
cloud
10:02 修订 18806e3e: *修改商城购买
cloud
09:38 修订 a68f8e04: *修改商城界面
cloud

2019-01-23

22:21 修订 c816d1fd: Merge branch 'develop_native' of http://rm.runfox.com/gitlab/root/rf_runfox_h5 into ...
JaneSnow
22:20 修订 ab540a33: 修改课程计划界面
JaneSnow
22:19 修订 83440802: ccc
邓小涛
22:17 修订 e2de2d72: Merge branch 'develop_native' of rm.runfox.com:root/rf_runfox_h5 into develop_native
# Conflicts:
# assets/Scene/scene_store.fire
邓小涛
22:17 修订 c4c6faa6: 开灯效果
leen
22:16 修订 b38d1a7d: 广告功能
邓小涛
22:12 修订 4fb6752e: Merge branch 'develop_native' of http://rm.runfox.com/gitlab/root/rf_runfox_h5 into ...
luh
22:12 修订 d2d85fb3: no message
luh
22:06 修订 8c226431: update
ZhouGang
22:04 修订 0b2d1933: 更新资源
ZhouGang
21:33 修订 a13ade32: Merge branch 'develop_native' of http://rm.runfox.com/gitlab/root/rf_runfox_h5 into ...
luh
21:33 修订 d89012ff: no message
luh
21:31 修订 f07799ad: Merge branch 'develop_native' of rm.runfox.com:root/rf_runfox_h5 into develop_native
cloud
21:30 修订 ded40a42: *修改滚动屏蔽
cloud
21:30 修订 5aec142b: no message
luh
21:26 修订 513f796e: no message
luh
21:12 修订 4e15e4bd: 删除多余的提示框
JaneSnow
21:02 修订 52a4c2b2: 删除基础卡包和扩展卡包,程序在SVN上取
JaneSnow
20:40 修订 b69d68dd: Merge branch 'develop_native' of http://rm.runfox.com/gitlab/root/rf_runfox_h5 into ...
JaneSnow
20:40 修订 c0dbdd95: 添加商城微信登录提示界面+修改课程中使用的通用好和坏提示界面
JaneSnow
20:25 修订 ab9352e6: no message
luh
20:20 修订 b26099da: 解决视频播放bug
ZhouGang
19:45 修订 d410720c: 修改商城适配,添加通用文字提示动画
JaneSnow
19:20 修订 76ae60e0: no message
luh
18:49 修订 cd3a4198: no message
张 张涛
18:45 修订 28887bc9: no message
luh
18:26 修订 7b6fa3a4: no message
张 张涛
18:18 修订 df374d33: Merge branch 'develop_native' of http://rm.runfox.com/gitlab/root/rf_runfox_h5 into ...
luh
18:16 修订 e2f560d3: no message
luh
18:08 修订 c3efa587: 新加单词音频
张 张涛
18:02 修订 fba02062: no message
luh
17:32 修订 e5a03456: Merge branch 'develop_native' of http://rm.runfox.com/gitlab/root/rf_runfox_h5 into ...
张 张涛
17:32 修订 b7de08a8: 新增单词卡片
张 张涛
17:29 修订 3e95188d: Merge branch 'develop_native' of rm.runfox.com:root/rf_runfox_h5 into develop_native
cloud
17:28 修订 bbdb52d8: *优化红包界面
cloud
17:27 修订 7d2b62ad: no message
张 张涛
17:19 修订 4839c279: *添加红包状态
cloud
17:00 修订 c1565b26: update
ZhouGang
16:57 修订 5f4bdda0: Merge branch 'develop_native' of rm.runfox.com:root/rf_runfox_h5 into develop_native
leen
16:57 修订 f823f971: bug
leen
16:50 修订 8333ea72: *优化界面加载
cloud
16:34 修订 92767307: 修改任务重钻石不足文字
JaneSnow
16:02 修订 419128a2: *优化网络请求
cloud
15:37 修订 1b7afc1f: Merge branch 'develop_native' of http://rm.runfox.com/gitlab/root/rf_runfox_h5 into ...
luh
15:37 修订 ddfc9a6a: no message
luh
15:37 修订 c80aac78: 调整布局
leen
15:35 修订 e4bd4312: no message
luh
15:16 修订 f189826f: Merge branch 'develop_native' of rm.runfox.com:root/rf_runfox_h5 into develop_native
ZhouGang
15:16 修订 58321ecb: 修改黑屏bug
ZhouGang
15:13 修订 e55ff7c7: *修改界面刷新
cloud
15:06 修订 548bda37: *修改商城bug
cloud
14:52 修订 0d56b70a: *修改刷新界面
cloud
14:48 修订 dd240a6f: *修改商城bug
cloud
14:46 修订 f24e553d: no message
luh
14:45 修订 31d9be6c: no message
luh
12:37 修订 37535f90: 最新房间资源
leen
12:20 修订 9d4f647e: 拖动一定距离才算点击
足球动画 leen
11:41 修订 b514965d: 1.修改任务界面的按钮和添加钻石不足提示和文字尺寸,2.修改地图界面切换level按钮大小,3.添加路点课程任务提示状态
JaneSnow

2019-01-22

21:45 修订 8cb746be: *修改api接口
cloud
21:36 修订 d053fa15: *修改购买商品
cloud
21:34 修订 9877ce73: 瓶子在手上的时候取消地影
leen
21:28 修订 3dba9874: *修改活动购买
cloud
21:07 修订 eb21296a: Merge branch 'develop_native' of rm.runfox.com:root/rf_runfox_h5 into develop_native
leen
21:07 修订 fd5c057a: a
leen
20:59 修订 08c2c690: no message
luh
20:58 修订 d358b3b3: no message
luh
20:55 修订 e8c0c2e2: *修改钻石价格
cloud
20:47 修订 2e112257: Merge branch 'develop_native' of rm.runfox.com:root/rf_runfox_h5 into develop_native
leen
20:46 修订 b71ffa15: a
leen
20:39 修订 d28ffcba: no message
luh
19:30 修订 be3b37b5: Merge branch 'develop_native' of rm.runfox.com:root/rf_runfox_h5 into develop_native
邓小涛
19:29 修订 5239b509: Merge branch 'develop_native' of rm.runfox.com:root/rf_runfox_h5 into develop_native
# Conflicts:
# assets/Script/Scene/CourseChooseUI/CourseChooseUI.ts
# assets/Script/UI/HomeGoSceneMap/HomeGoSceneMap....
邓小涛
19:17 修订 10bf7353: 食物语音
leen
19:12 修订 9b2499e2: commit android ads
邓小涛
18:57 修订 5572e34c: 每次打开冰箱商场都重新请求数据
leen
18:42 修订 991af227: no message
张 张涛
18:33 修订 53141f1b: Merge branch 'develop_native' of rm.runfox.com:root/rf_runfox_h5 into develop_native
ZhouGang
18:33 修订 6ecd1483: 部分解决内存泄漏问题
ZhouGang
18:31 修订 b2e65ebe: no message
张 张涛
18:27 修订 4b33292c: Merge branch 'develop_native' of rm.runfox.com:root/rf_runfox_h5 into develop_native
leen
18:27 修订 c51e25d6: bug
leen
18:00 修订 c6931fbe: *添加红包相关接口
cloud
17:58 修订 df3051f3: *添加口令红包
cloud
17:39 修订 5d1288f4: *添加口令红包界面
cloud
17:22 修订 d18278b9: Merge branch 'develop_native' of rm.runfox.com:root/rf_runfox_h5 into develop_native
cloud
17:22 修订 887bc7ab: *修改免费领取红包砖石
cloud
17:22 修订 fc4825ab: no message
luh
17:21 修订 174cefd8: no message
luh
17:16 修订 ba9c5912: Merge branch 'develop_native' of http://rm.runfox.com/gitlab/root/rf_runfox_h5 into ...
张 张涛
17:16 修订 2ae19a0a: 禁止点击
张 张涛
17:14 修订 f8339625: a
leen
16:58 修订 0d102de2: no message
张 张涛
16:48 修订 29c8ca68: 节点绑定spine插槽,重新构建编译生效
leen
16:31 修订 5b31cd07: *添加红包和广告
cloud
16:23 修订 4895a0b2: Merge branch 'develop_native' of rm.runfox.com:root/rf_runfox_h5 into develop_native
cloud
16:23 修订 20e393b2: *修改商城课程购买
cloud
16:20 修订 5512bfec: 单词训练功能
张 张涛
16:14 修订 74dde86e: *添加课程购买
cloud
16:09 修订 2abcc00e: *优化购买流程
cloud
15:47 修订 f64b1b6a: *添加购买成功失败
cloud
15:15 修订 1ba0b524: *修改购买成功效果
cloud
14:49 修订 dafd2441: no message
luh
14:48 修订 be24487b: no message
luh
14:35 修订 283926f5: update
ZhouGang
14:16 修订 33d27031: *修改商城购买
cloud
12:07 修订 e1f45dc7: *修改家长验证
cloud
11:53 修订 d4013da4: *优化家长控制界面
cloud
11:21 修订 a991cb78: *更新商城显示单词包
cloud
10:54 修订 b8811f1d: *修改弹窗详情
cloud

2019-01-21

18:25 修订 f50508e0: no message
luh
18:04 修订 b773a51c: 活动详情
cloud
17:48 修订 79369e78: Merge branch 'develop_native' of rm.runfox.com:root/rf_runfox_h5 into develop_native
leen
17:47 修订 af1e5021: 增加食物
leen
17:37 修订 648cb658: no message
luh
17:08 修订 7e1c04a9: *点击物品弹出详细框
cloud
16:30 修订 f6c9de4d: 删除多余的任务宝箱图标
JaneSnow
16:26 修订 f2511893: no message
张 张涛
16:21 修订 f6a1deaa: 新增任务系统内容
JaneSnow
15:49 修订 f3502c54: *优化活动购买
cloud
15:31 修订 c1359922: *添加详情弹窗
cloud
15:18 修订 9cc8dd5b: *优化活动时间
cloud
14:36 修订 4883ccea: *优化商城活动
cloud
11:02 修订 c7bfb585: *修改图片路径
cloud
10:52 修订 5516f5a0: *优化课程包
cloud

2019-01-19

18:32 修订 f256f120: update
ZhouGang
17:55 修订 d1dbc234: 上传商城购买获得钻石效果
JaneSnow
17:16 修订 eaebcc55: 添加商城微信和支付宝支付界面
JaneSnow
16:44 修订 b066243d: Merge branch 'develop_native' of http://rm.runfox.com/gitlab/root/rf_runfox_h5 into ...
JaneSnow
16:44 修订 9d0e1381: 上传商城购买成功和购买失败通用特效
JaneSnow
16:22 修订 af3f0248: no message
luh
16:22 修订 49b4215e: Merge branch 'develop_native' of http://rm.runfox.com/gitlab/root/rf_runfox_h5 into ...
luh
16:22 修订 a18a147b: no message
luh
15:49 修订 a120af46: *商城切换
cloud
15:32 修订 e719ee0b: no message
luh
15:18 修订 7993dd52: no message
luh
14:54 修订 5afc284d: *添加课程礼包
cloud
11:59 修订 529c75ae: *修改钻石购买
cloud
11:52 修订 95b300ae: 地图界面新增基础卡包预制
JaneSnow
11:14 修订 99fbadce: *修改打开家长校验
cloud
11:06 修订 172b0b8e: *修改商城
cloud
10:54 修订 3c2d9e83: update
ZhouGang

2019-01-18

18:46 修订 4143ae7c: 修改地图界面基础卡包资源
JaneSnow
18:26 修订 5f1fdbbb: 浏览器播放音效兼容
张 张涛
18:25 修订 850934a4: 房间气泡 大小 位置
张 张涛
18:21 修订 b8f860bf: *修改滚动效果
cloud
18:16 修订 093e9aa3: 上传新的商城界面
JaneSnow
17:36 修订 ead9f3cf: 修改回忆模式bug,修改itemin bug, 新增换肤模块
ZhouGang
17:15 修订 a9edfa1c: *添加支付插件
cloud
15:45 修订 16797625: 场景 进入动画
张 张涛
11:49 修订 0daca951: no message
luh
11:41 修订 beca0fd5: no message
luh
11:03 修订 83bbc264: *添加android包通用channel
cloud
10:28 修订 05cdc444: *android 通用 channel 为2
cloud

2019-01-17

16:06 修订 1747d0d6: no message
luh
15:48 修订 752deb2e: no message
luh
15:29 修订 c54e56cd: no message
luh
15:17 修订 02f529fb: bug
leen
14:52 修订 4e61c31e: a
leen
12:44 修订 c3309892: 吃食物跟服务器同步了
多点触控导致角色掉下去的bug
瓶子资源大小变动
leen
11:35 修订 3fba1654: no message
luh

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
 

导出 Atom