lishuo/powerfun-unity
1
1 Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
426 Commits 9 Branches 14 Tags
e3e2f5200b237743e70e9a530bb602fe976018c6
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Caiyanpeng e3e2f5200b Merge remote-tracking branch 'origin/dev_memory' into dev_cyp 2021-11-16 18:41:22 +08:00
Caiyanpeng 6a4390f1b9 两个列表进骑行释放内存 2021-11-16 18:41:18 +08:00
Caiyanpeng 3295314b7e Merge remote-tracking branch 'origin/dev_memory' into dev_cyp 2021-11-15 15:21:46 +08:00
Caiyanpeng b79584f745 删除appcenter；删除打包后的debug 2021-11-15 11:38:13 +08:00
Caiyanpeng 402f19b8a5 Merge remote-tracking branch 'origin/dev_memory' into dev_cyp 
# Conflicts:
#	Assets/Scenes/Login-Mobile.unity
#	Assets/Scenes/Login.unity
 2021-11-15 11:34:49 +08:00
Caiyanpeng 9acde45f4a 一些设置调整；进入骑行时请texture 2021-11-15 11:33:57 +08:00
Caiyanpeng d754ff3b15 app center；增加發送ping的秒 2021-11-12 16:21:13 +08:00
Caiyanpeng 8e88b4adba 地球null问题，隐藏划船机 2021-11-09 16:47:21 +08:00
Caiyanpeng 609e4dc367 延迟问题解决 2021-11-09 11:37:10 +08:00
Caiyanpeng 9a545f00f4 修改细节 2021-11-08 13:07:08 +08:00
Caiyanpeng baab5a9fb0 修改细节 2021-11-03 13:48:53 +08:00
Caiyanpeng e8a12452ca Merge remote-tracking branch 'origin/dev_mobile_ble' into dev_release 2021-11-03 09:52:51 +08:00
Caiyanpeng f92b623349 暂存 2021-11-03 09:52:03 +08:00
Caiyanpeng 558fb16160 增加编号，loading页提示，延迟毫秒 2021-11-01 11:04:22 +08:00
Caiyanpeng b9aa0131cc 划船机保存前读秒 2021-10-25 16:13:04 +08:00
Caiyanpeng eb21914fb7 划船机其他细节 2021-10-22 18:18:26 +08:00
Caiyanpeng a4e17a56d0 划船机停止逻辑，切换图标 2021-10-21 18:04:33 +08:00
Caiyanpeng e503443f22 Merge branch 'dev_rower' into dev_release 
# Conflicts:
#	Assets/Scenes/Login-Mobile.unity
 2021-10-20 15:12:05 +08:00
Caiyanpeng 3a834fca08 ios审核先屏蔽第三方登录 2021-10-20 14:58:37 +08:00
Caiyanpeng 8f8ee0b833 android11跳转 2021-10-20 13:32:43 +08:00
Caiyanpeng 26e4e81402 暂存 2021-10-20 10:20:12 +08:00
Caiyanpeng b075279a14 增加搜索框，ios图片名重复问题 2021-10-18 14:03:26 +08:00
Caiyanpeng f731494396 pc兼容 2021-10-15 09:54:23 +08:00
Caiyanpeng dd4157cbc2 一些设置 2021-10-15 09:29:05 +08:00
Caiyanpeng 05f6c8a08b 微信注册样式问题 2021-10-14 14:04:44 +08:00
Caiyanpeng 3c540dece4 修改细节 2021-10-13 19:03:22 +08:00
Caiyanpeng d8adb8a5b8 Merge remote-tracking branch 'origin/dev_mobile_ble' into dev_release 2021-10-13 11:29:14 +08:00
Caiyanpeng 9be2e77ae5 设备连接页面检测定位服务 2021-10-13 11:29:09 +08:00
Caiyanpeng efd1795e63 Merge remote-tracking branch 'origin/dev_mobile_ble' into dev_release 2021-10-12 20:51:07 +08:00
Caiyanpeng f0314adb27 隐藏划船机 2021-10-12 20:26:41 +08:00
Caiyanpeng 2f0291836e ios以及bug处理 2021-10-12 20:26:25 +08:00
Caiyanpeng d4326ffb42 Merge remote-tracking branch 'origin/dev_mobile_ble' into dev_release 2021-10-12 20:11:18 +08:00
Caiyanpeng 44ff898f8d 更新弹窗 2021-10-12 20:07:13 +08:00
Caiyanpeng c19b8630cf 修改loading序列帧 2021-10-11 13:25:37 +08:00
Caiyanpeng 55d7304de1 pc打包错误 2021-10-09 15:05:41 +08:00
Caiyanpeng f1ddde8a2e Merge branch 'dev_mobile' into dev_gesture 2021-10-09 10:45:56 +08:00
Caiyanpeng cad2e92fd2 编辑页面手势应用 2021-10-09 10:42:27 +08:00
Caiyanpeng 4aa6178495 赛事卡片bug修正 2021-10-08 17:04:55 +08:00
Caiyanpeng fd8f419f09 手势插件引入暂存 2021-10-08 16:03:55 +08:00
Caiyanpeng 6d1bc8e2c8 暂存 2021-10-08 15:22:20 +08:00
Caiyanpeng d035361718 ios端时间格式错误问题 2021-09-30 17:09:52 +08:00
Caiyanpeng 6501284bbc 地球收藏问题，ios 蓝牙有返回值处理，划船机倒计时1时重置 2021-09-30 15:23:40 +08:00
Caiyanpeng 9511e30e50 蓝牙问题 2021-09-30 09:06:35 +08:00
Caiyanpeng 561ad993b8 调整动画和chart图标细节，重置命令 2021-09-29 14:37:43 +08:00
Caiyanpeng 8d8fd59a80 修改细节 2021-09-28 20:35:16 +08:00
Caiyanpeng b74c3b57b4 倒计时；三按钮弹窗 2021-09-28 17:51:58 +08:00
Caiyanpeng 85e0a13f08 增加选择页，修改记录列表pc兼容 2021-09-28 15:25:52 +08:00
Caiyanpeng 8802676b98 Merge remote-tracking branch 'origin/dev_mobile_ble' into dev_mobile 2021-09-28 11:31:11 +08:00
Caiyanpeng 5bd1c3b1ca Merge remote-tracking branch 'origin/dev_mobile_ble' into dev_mobile 
# Conflicts:
#	Assets/Scripts/Scenes/MainController.cs
 2021-09-28 11:30:08 +08:00
Caiyanpeng c73545d912 划船机暂存 2021-09-28 11:27:24 +08:00
Caiyanpeng 1c73701e73 Merge remote-tracking branch 'origin/dev_mobile_ble' into dev_mobile 2021-09-17 22:20:47 +08:00
Caiyanpeng 9eab7c847b 苹果横屏翻转 2021-09-17 20:21:45 +08:00
Caiyanpeng f35dea5c6a Merge remote-tracking branch 'origin/dev_mobile_ble' into dev_mobile 2021-09-17 18:51:33 +08:00
Caiyanpeng 18b330fa30 两个平台屏幕可转 2021-09-17 18:50:50 +08:00
Caiyanpeng 65f2b0af0a 判断int型异常 2021-09-17 09:35:15 +08:00
Caiyanpeng 40b6205abc Merge remote-tracking branch 'origin/dev_mobile_ble' into dev_mobile 2021-09-16 20:35:25 +08:00
Caiyanpeng 750d9107b4 Merge remote-tracking branch 'origin/dev_mobile_ble' into dev_mobile 2021-09-16 19:50:38 +08:00
Caiyanpeng 26250f3e47 iphone7以下光圈去掉 2021-09-16 19:49:45 +08:00
Caiyanpeng 806116af19 修改样式 2021-09-16 17:09:40 +08:00
Caiyanpeng 1b7e585027 修改包名 2021-09-16 15:36:36 +08:00
Caiyanpeng 8c7a9afaa3 取消开始应用请求权限；淡入淡出ios 2021-09-15 21:11:21 +08:00
Caiyanpeng 49c264ff36 Merge remote-tracking branch 'origin/dev_mobile_ble' into dev_mobile 2021-09-15 20:06:35 +08:00
Caiyanpeng 7d4617eca6 Merge remote-tracking branch 'origin/dev_mobile_ble' into dev_mobile 2021-09-15 19:30:47 +08:00
Caiyanpeng 48397f3d1d 修改细节，安卓一进应用请求权限 2021-09-15 19:30:41 +08:00
Caiyanpeng 15015f83a8 Merge remote-tracking branch 'origin/dev_mobile_ble' into dev_mobile 
# Conflicts:
#	Assets/Scripts/App.cs
 2021-09-15 10:45:53 +08:00
Caiyanpeng 6fa4504e46 替换图片，push问题，ios配置，常亮 2021-09-15 10:45:11 +08:00
Caiyanpeng e84f14250b 比赛卡片效果修改；useragent修改；微信错误提示 2021-09-14 11:14:51 +08:00
Caiyanpeng 969835e4d7 微信登录接入；卡片点击效果 2021-09-13 17:33:58 +08:00
Caiyanpeng f1f982b90c iosbug；android不需要导出项目；修改样式；可修改头像 2021-09-09 15:44:28 +08:00
Caiyanpeng 50ad74bb09 赛事角标刷新；处理弹窗层次问题 2021-09-08 17:53:43 +08:00
Caiyanpeng 5a148c28a8 赛事筛选；微信角标切口；选择图片功能权限问题 
选择图片功能权限问题，需先导出项目，将res/xml文件夹复制到unitylibrary的res文件夹下
 2021-09-08 10:29:20 +08:00
Caiyanpeng b86cb01ea2 修改样式，增加图片 2021-09-07 16:12:16 +08:00
Caiyanpeng fe65b83c89 ios选择图片功能，结果列表扩大 2021-09-07 15:26:43 +08:00
Caiyanpeng 510cd11049 意见反馈增加图片 2021-09-07 11:14:42 +08:00
Caiyanpeng b11c5de681 修改样式 2021-09-06 17:50:01 +08:00
Caiyanpeng 169b9719f6 图片改名 2021-09-03 15:10:18 +08:00
Caiyanpeng 1254414415 修改细节 2021-09-03 15:03:54 +08:00
Caiyanpeng 2663068574 地球页面；反馈页面样式修改 2021-09-01 16:14:45 +08:00
Caiyanpeng 3ec6fd0569 比赛；编辑页面 2021-08-31 17:11:43 +08:00
Caiyanpeng 85130ce6c3 Merge remote-tracking branch 'origin/dev_mobile_ble' into dev_mobile 
# Conflicts:
#	Assets/Scripts/Scenes/MainController.cs
 2021-08-27 10:13:17 +08:00
Caiyanpeng 428a7c5507 暫存 2021-08-27 10:12:50 +08:00
Caiyanpeng f21b83697b 暂存 2021-08-26 15:49:06 +08:00
Caiyanpeng 723c881790 Merge remote-tracking branch 'origin/dev_mobile_ble' into dev_mobile 2021-08-26 09:29:42 +08:00
Caiyanpeng e1a85eeb5e 结果列表页，用户页 2021-08-26 09:29:35 +08:00
Caiyanpeng 89e3a04fe9 暂存 2021-08-25 15:35:41 +08:00
Caiyanpeng 88beff5b89 条件编译报错问题 2021-08-25 10:31:20 +08:00
Caiyanpeng f155b2b627 Merge remote-tracking branch 'origin/dev_mobile_ble' into dev_mobile 
# Conflicts:
#	Assets/Plugins/Android/AndroidManifest.xml
#	Assets/Plugins/Android/AndroidManifest.xml.meta
#	Assets/Plugins/iOS.meta
#	Assets/Scripts/App.cs
#	Assets/Scripts/Devices/MainDeviceAdapter.cs
#	Assets/Scripts/Scenes/LoginController.cs
#	Assets/Scripts/Scenes/Ride/Scripts/PlayerController.cs
 2021-08-25 10:23:51 +08:00
Caiyanpeng 341195d78d 暂存 2021-08-25 10:20:33 +08:00
Caiyanpeng 3c9d489c76 增加移动端界面暂存 2021-08-24 17:50:14 +08:00
Caiyanpeng 31e8e3bebb 移动端微信接入 2021-08-24 09:28:46 +08:00
Caiyanpeng ca91f45ef3 切换移动端暂存 2021-08-19 16:28:57 +08:00
Caiyanpeng f14a071179 修改字 2021-08-19 16:24:54 +08:00
Caiyanpeng 34a2c0bbb2 稍微逻辑修改 2021-08-19 13:23:22 +08:00
Caiyanpeng 35b5ab59d3 切换移动端暂存 2021-08-13 17:19:02 +08:00
Caiyanpeng 906dc7dec8 闪动问题 2021-08-12 16:29:00 +08:00
Caiyanpeng 3902865658 Merge remote-tracking branch 'origin/dev_lishuo' into dev_cyp 2021-08-12 13:24:38 +08:00
Caiyanpeng 25dcf0fde3 序列帧缺失问题 2021-08-12 11:22:37 +08:00
Caiyanpeng bb8a0712b7 处理空广告页情况 2021-08-12 10:03:29 +08:00
Caiyanpeng 81a7af517a 修改台湾旗帜 2021-08-10 09:41:14 +08:00
Caiyanpeng 40bb16a132 修改all race跳到顶上的bug 2021-08-09 17:11:14 +08:00