lishuo/powerfun-unity
1
1 Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
456 Commits 9 Branches 14 Tags
fa144dbaa0440367b9830a5ee986a5f5bcfb4db2
Commit Graph
109 Commits
Author SHA1 Message Date
Caiyanpeng 929fb0a1a7 修改细节 2021-07-26 14:08:43 +08:00
lishuo ac59808915 Merge remote-tracking branch 'origin/dev_cyp' into dev_lishuo 
# Conflicts:
#	Assets/Scripts/Apis/Models/MapCompetition.cs
#	Assets/Scripts/UI/Prefab/Race/RaceButtonGroupScript.cs
 2021-07-23 18:11:58 +08:00
Caiyanpeng ae3f9d2101 一些细节修改 2021-07-23 15:04:46 +08:00
lishuo 21529db9dc Merge remote-tracking branch 'origin/dev_cyp' into dev_lishuo 2021-07-23 10:18:23 +08:00
Caiyanpeng 1c2afb4125 增加一些图片，enter数据源 2021-07-23 10:02:09 +08:00
lishuo d18ff09002 Merge remote-tracking branch 'origin/dev_cyp' into dev_lishuo 
# Conflicts:
#	Assets/Scripts/Apis/Models/MapCompetition.cs
 2021-07-23 09:43:46 +08:00
Caiyanpeng d9d66ab96c 赛事首页和列表 2021-07-23 09:41:20 +08:00
lishuo e76b5c443f 赛事功能完善 
创建比赛按钮；loading页面more按钮等
 2021-07-23 09:04:56 +08:00
lishuo eed2d13624 loading页&结果页面&代码结构微调 2021-07-16 18:37:02 +08:00
lishuo d6a7cd798f tcp逻辑调整，历史逻辑增加赛事相关派生类 2021-07-01 18:41:35 +08:00
suntao 25c866d090 修改连接设备界面;修改大地图在panel上缩放大地图也缩放的问题 2021-06-09 11:27:11 +08:00
suntao 7729332f41 接入基本设备 2021-06-04 13:22:59 +08:00
lishuo 7ba012f5f2 界面微调，设备连接中断跳时间bug修复 2021-05-20 15:55:27 +08:00
lishuo 46cc231fe7 海拔图区间微调，消息面板&线路等微调 2021-05-13 17:48:28 +08:00
suntao 53ec9c60ac 小调整 2021-05-12 10:42:26 +08:00
suntao a7ea02f70a Merge branch 'dev_lishuo' into dev 
# Conflicts:
#	.gitignore
#	Assets/Scenes/Ride/Scripts/SelectPlayerFactory.cs
 2021-05-12 10:30:08 +08:00
Caiyanpeng 2c5501a096 更新页面，目前是强制更新 2021-05-11 10:47:04 +08:00
lishuo 2b4b2c4f70 小地图进度微调，人物脚本调整 2021-05-10 18:13:27 +08:00
lishuo e4d4333357 视角切换&小地图模糊问题解决 2021-05-07 18:41:37 +08:00
suntao 9f4e446850 修改设备图标。连接设备加缓存功能。 2021-04-30 18:03:34 +08:00
Caiyanpeng f6a4ebda8c Merge remote-tracking branch 'origin/dev_lishuo' into dev_cyp 2021-04-30 17:46:06 +08:00
Caiyanpeng 333542a63a 第一次进地球，登录页bug修改，主页面交互修改，其它细节 2021-04-30 17:46:00 +08:00
lishuo 48c5b161b1 ant+和http组件bug修复 2021-04-30 17:25:28 +08:00
lishuo a49acaab1e Merge remote-tracking branch 'origin/dev' into dev_lishuo 2021-04-29 18:13:05 +08:00
suntao de61fbd291 调整连接设备样式。调整地球样式。去掉灯光。 2021-04-29 18:10:09 +08:00
lishuo ae55258b9b 骑行界面按钮替换，界面&逻辑调整 2021-04-29 18:07:30 +08:00
Caiyanpeng 4cb40f2c8e 修改细节，增加图标和splash image，最后需要用破解版打包 2021-04-29 18:05:00 +08:00
Caiyanpeng b15a4fe2c1 修改细节 2021-04-28 18:41:54 +08:00
Caiyanpeng 86a5b68317 修改细节 2021-04-27 19:29:22 +08:00
Caiyanpeng 1002b0433a 接动态地图，忘记密码，文件弹窗置顶 2021-04-27 14:58:49 +08:00
lishuo bbc3deeef2 Merge remote-tracking branch 'origin/dev_cyp' into dev_lishuo 
# Conflicts:
#	Assets/Scripts/Utils/Utils.cs
 2021-04-25 13:51:21 +08:00
Caiyanpeng 048538a0c8 修改细节 2021-04-25 13:35:07 +08:00
lishuo 11fdcff7c3 动画文件 2021-04-23 19:30:04 +08:00
lishuo a96d538dc1 Merge remote-tracking branch 'origin/dev' into dev_lishuo 2021-04-23 09:37:55 +08:00
suntao 4347a8eeba 细节调整 2021-04-23 09:22:12 +08:00
Caiyanpeng dd08f916eb 意见反馈 修改细节 2021-04-23 09:12:32 +08:00
lishuo 96f3644b5b graph chart引入&骑行结果弹窗 2021-04-22 19:29:59 +08:00
lishuo e7ad9473a5 新版骑行页面前备份 2021-04-21 14:08:45 +08:00
suntao 2d20edf57a 加淡入淡出效果。重设字体。加退出导航。 2021-04-19 18:16:56 +08:00
lishuo af63072f29 Merge remote-tracking branch 'origin/dev' into dev_lishuo 
# Conflicts:
#	Assets/Resources/Apis/Models.meta
#	Assets/Scripts/UI/Prefab/ResultList/RouteItem.cs
 2021-04-19 14:40:43 +08:00
lishuo afba150d91 继骑&重骑骑行结果页细节调整 2021-04-19 14:38:31 +08:00
suntao f065bf4bbb 调整样式 2021-04-19 14:36:08 +08:00
suntao 19766db051 Merge branch 'dev_cyp' into dev 
# Conflicts:
#	Assets/Resources/Loading.meta
#	Assets/Scripts/Apis/MapApi.cs
#	Assets/Scripts/UI/Prefab/Panel/MapListController.cs
 2021-04-19 14:15:34 +08:00
Caiyanpeng 0346b650aa 暂存 2021-04-19 14:11:53 +08:00
lishuo 70626ae741 Merge remote-tracking branch 'origin/dev' into dev_lishuo 
# Conflicts:
#	Assets/NuGet.meta
#	Assets/Resources/Images/Ride.meta
#	Assets/Resources/Sound.meta
#	Assets/Scripts/App.cs
#	Assets/Scripts/UI/Prefab/BigMap/Tips.cs
#	Assets/StreamingAssets.meta
 2021-04-15 17:14:00 +08:00
suntao e04ae0b085 细节调整 2021-04-15 15:57:29 +08:00
lishuo 62938ec6ae Merge remote-tracking branch 'origin/dev' into dev_lishuo 
# Conflicts:
#	Assets/Scripts/Apis/MapApi.cs
#	Assets/Scripts/App.cs
 2021-04-15 10:22:55 +08:00
lishuo 7744eec847 伴侣骑行 2021-04-15 10:13:01 +08:00
suntao 038720e7bd Merge branch 'modify-ui' into dev 
# Conflicts:
#	Assets/Scripts/UI/Prefab/Panel/HomeController.cs
#	Assets/Scripts/Utils/Utils.cs
 2021-04-15 09:24:15 +08:00
suntao d22eecd133 完成大地图主要界面 2021-04-15 09:01:07 +08:00