lishuo/powerfun-unity
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
powerfun-unity/Assets/Scripts
History
lishuo 342740b740 Merge branch 'dev_cyp1' into dev_combine 
# Conflicts:
#	.gitignore
#	Assets/Scripts/Devices/Ble/Characteristic/C2RowerData.cs
#	Assets/Scripts/Scenes/MainController.cs
2022-07-11 14:52:54 +08:00
..
Apis
Merge branch 'dev_cyp1' into dev_combine
2022-07-11 14:52:54 +08:00
Devices
Merge branch 'dev_cyp1' into dev_combine
2022-07-11 14:52:54 +08:00
Mobile
暂存
2022-03-09 09:11:53 +08:00
Scenes
发布前微调
2022-07-08 18:55:27 +08:00
UI
Merge branch 'dev_cyp1' into dev_combine
2022-07-11 14:52:54 +08:00
Utils
Merge branch 'dev_cyp' into dev_ar_cyp
2022-06-02 11:30:37 +08:00
Apis.meta
添加nuget和网络请求api
2021-03-22 16:06:28 +08:00
App.cs
Merge branch 'dev_cyp1' into dev_combine
2022-07-11 14:52:54 +08:00
App.cs.meta
添加uimanager和主场景
2021-03-25 16:53:39 +08:00
ConfigHelper.cs
Merge branch 'dev_cyp' into dev_ar_cyp
2022-06-02 11:30:37 +08:00
ConfigHelper.cs.meta
添加nuget和网络请求api
2021-03-22 16:06:28 +08:00
Devices.meta
加ant+相关代码。
2021-03-30 14:23:41 +08:00
Editor.meta
AR初版demo
2022-03-04 16:12:15 +08:00
Mobile.meta
移动端微信接入
2021-08-24 09:28:46 +08:00
PFConstants.cs
Merge branch 'dev_cyp' into dev_ar_cyp
2022-06-02 11:30:37 +08:00
PFConstants.cs.meta
修复台湾问题；加服务器时间；
2021-05-08 11:09:03 +08:00
Scenes.meta
添加uimanager和主场景
2021-03-25 16:53:39 +08:00
UI.meta
处理合并冲突
2021-03-30 20:00:11 +08:00
UIManager.cs
Merge branch 'dev_cyp1' into dev_combine
2022-07-11 14:52:54 +08:00
UIManager.cs.meta
添加uimanager和主场景
2021-03-25 16:53:39 +08:00
UnityMainThreadDispatcher.cs
单点登录不在进程内运行问题；gps取定位服务的；点击图标显示毫秒
2021-11-18 14:45:31 +08:00
UnityMainThreadDispatcher.cs.meta
单点登录不在进程内运行问题；gps取定位服务的；点击图标显示毫秒
2021-11-18 14:45:31 +08:00
Utils.meta
处理合并冲突
2021-03-30 20:00:11 +08:00