|
|
f065bf4bbb
|
调整样式
|
2021-04-19 14:36:08 +08:00 |
|
|
|
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 |
|
|
|
0346b650aa
|
暂存
|
2021-04-19 14:11:53 +08:00 |
|
|
|
018699c944
|
Loading页面渐隐
|
2021-04-16 11:23:18 +08:00 |
|
|
|
10c82703f4
|
人物移动调整
|
2021-04-15 17:29:32 +08:00 |
|
|
|
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 |
|
|
|
92e43c2cd8
|
路线产生逻辑微调
|
2021-04-15 17:09:35 +08:00 |
|
|
|
f4cbad819b
|
Merge remote-tracking branch 'origin/dev' into dev_cyp
# Conflicts:
# Assets/Resources/Images/back.png.meta
# Assets/Resources/Images/change account.png.meta
# Assets/Scripts/UI/Prefab/Panel/EditUserController.cs
|
2021-04-15 15:59:57 +08:00 |
|
|
|
c97bd50f3f
|
暂存
|
2021-04-15 15:58:37 +08:00 |
|
|
|
e04ae0b085
|
细节调整
|
2021-04-15 15:57:29 +08:00 |
|
|
|
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 |
|
|
|
7744eec847
|
伴侣骑行
|
2021-04-15 10:13:01 +08:00 |
|
|
|
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 |
|
|
|
d22eecd133
|
完成大地图主要界面
|
2021-04-15 09:01:07 +08:00 |
|
|
|
10e738f958
|
登录页调整 增加半圆角组件 基本完成路线列表功能 基本完成骑行列表 开始做编辑页
|
2021-04-14 17:57:52 +08:00 |
|
|
|
34cde86a28
|
Merge remote-tracking branch 'origin/dev' into dev_lishuo
# Conflicts:
# Assets/Scripts/Apis/UserApi.cs
# Assets/Scripts/App.cs
# Assets/Scripts/ConfigHelper.cs
# Assets/Scripts/Scenes/LoginController.cs
# Assets/Scripts/UI/Prefab/Panel/HomeController.cs
|
2021-04-12 17:42:56 +08:00 |
|
|
|
2fcd9b23fa
|
附近的人
|
2021-04-12 17:35:56 +08:00 |
|
|
|
5156473bb2
|
加弹框。修改连接设备样式。
|
2021-04-09 09:44:06 +08:00 |
|
|
|
07feba912c
|
浏览器嵌入，国旗文件
|
2021-04-09 09:19:04 +08:00 |
|
|
|
725b510748
|
动态海拔图，全路线小地图，骑行记录上传增加截图
|
2021-04-07 17:22:45 +08:00 |
|
|
|
65fc5b5c50
|
场景加载处理一些卡顿的情况
|
2021-04-02 19:17:23 +08:00 |
|
|
|
e7a3214cb5
|
设备连接页加返回按钮
|
2021-04-01 14:29:58 +08:00 |
|
|
|
ae9cefc645
|
Merge remote-tracking branch 'origin/dev' into dev_lishuo
# Conflicts:
# Assets/Cyp/Prefab.meta
# Assets/Mapbox/Core/Plugins/Android.meta
# Assets/Mapbox/Core/Plugins/Mapbox.meta
# Assets/Mapbox/Core/Plugins/Mapbox/MapboxAccounts.meta
# Assets/Plugins/Circle/ImageWithRoundedCorners.cs
# Assets/Resources/Images/Devices.meta
# Assets/Resources/UI/Prefab/Item.meta
# Assets/Scripts/Devices/Ant/LegacyPages.meta
# Assets/Scripts/UI/Prefab/Item.meta
# Assets/StreamingAssets.meta
# ProjectSettings/EditorBuildSettings.asset
|
2021-04-01 14:09:23 +08:00 |
|
|
|
ec7589096f
|
实现连接设备界面
|
2021-04-01 11:09:53 +08:00 |
|
|
|
2e6338bcf3
|
新增人物控制器抽象类
|
2021-04-01 11:01:29 +08:00 |
|
|
|
996f924719
|
登录页一些特效，路书列表详情框架
|
2021-04-01 11:01:05 +08:00 |
|
|
|
eb93577d68
|
修改坡度计算逻辑，骑行界面大部分完成
|
2021-03-31 20:46:57 +08:00 |
|
|
|
b0f6c39118
|
处理合并冲突
|
2021-03-30 20:00:11 +08:00 |
|
|
|
8638cd97de
|
Merge branch 'dev_lishuo' of https://gitlab.com/rhino4biz/powerfun/powerfun-unity into dev_lishuo
# Conflicts:
# Assets/DOTween.meta
# Assets/Mapbox/Core/Plugins/Android.meta
# Assets/Mapbox/Unity/Map/InitializeMapWithLocationProvider.cs
# Assets/Plugins/Newtonsoft.Json.dll
# Assets/Prefabs.meta
# Assets/Resources.meta
# Assets/Scenes/Ride/Minimap Render Texture.renderTexture
# Assets/Scenes/Ride/Ride.unity
# Assets/Scenes/Ride/Scripts/Helper.cs
# Assets/Scenes/Ride/Scripts/PlayerController.cs
# Assets/Scenes/Ride/Scripts/RouteController.cs
# Assets/Scenes/Ride/Scripts/UIManager.cs
# Packages/manifest.json
# Packages/packages-lock.json
|
2021-03-30 19:35:32 +08:00 |
|
|
|
dad88828d2
|
合并后处理冲突
|
2021-03-30 19:32:11 +08:00 |
|
|
|
9a7830f46a
|
骑行界面调整，底层逻辑细化
|
2021-03-30 17:30:29 +08:00 |
|
|
|
d5133ee7b0
|
骑行界面UI
|
2021-03-30 17:29:40 +08:00 |
|
|
|
8ad36c965d
|
海拔图和小地图
|
2021-03-30 17:29:40 +08:00 |
|
|
|
42fa59d103
|
解决相机抖动和人物移动动画不流畅的问题
|
2021-03-30 17:29:39 +08:00 |
|
|
|
0ab0e99597
|
骑行计算逻辑调整
|
2021-03-30 17:29:39 +08:00 |
|
|
|
971a6f7e0e
|
单人骑行
|
2021-03-30 17:27:50 +08:00 |
|
|
|
326b74bd03
|
注释模态窗口
|
2021-03-30 14:27:09 +08:00 |
|
|
|
3c2bb10f07
|
加ant+相关代码。
|
2021-03-30 14:23:41 +08:00 |
|
|
|
f45711f39f
|
登录页一些效果，接路线列表页
|
2021-03-30 14:14:24 +08:00 |
|
|
|
db3fc6ee83
|
骑行界面UI
|
2021-03-29 20:32:30 +08:00 |
|
|
|
d1d9c92f1c
|
Merge remote-tracking branch 'origin/dev' into dev_cyp
|
2021-03-29 10:00:31 +08:00 |
|
|
|
cbc79df8a2
|
暂存
|
2021-03-29 09:19:48 +08:00 |
|
|
|
38d1c387c3
|
加场景切换和事件绑定功能
|
2021-03-29 09:10:59 +08:00 |
|
|
|
c5bd9daba2
|
海拔图和小地图
|
2021-03-28 18:17:15 +08:00 |
|
|
|
e7044b3cde
|
前两个页面迁移完成
|
2021-03-26 09:50:04 +08:00 |
|
|
|
ba324aa68d
|
主场景迁移
|
2021-03-25 17:18:51 +08:00 |
|
|
|
ba994e715c
|
Merge branch 'dev_cyp' into dev
# Conflicts:
# Assets/Resources.meta
|
2021-03-25 16:58:03 +08:00 |
|
|
|
6f7c4e78bd
|
暂存
|
2021-03-25 16:55:36 +08:00 |
|
|
|
4ecf26ec80
|
添加uimanager和主场景
|
2021-03-25 16:53:39 +08:00 |
|
|
|
45801dff22
|
解决相机抖动和人物移动动画不流畅的问题
|
2021-03-25 16:22:09 +08:00 |
|
