lishuo/powerfun-unity
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev' into dev_lishuo

Browse Source 
# Conflicts:
#	Assets/Scenes/Ride/Ride.unity
This commit is contained in:
lishuo 2021-04-29 22:17:24 +08:00
commit b030294bd6
23 changed files with 1795 additions and 1634 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Assets/Editor/MyBuildPostprocessor.cs
View File

@ -14,8 +14,8 @@ public class MyBuildPostprocessor
//System.IO.File.AppendAllText("D:\\test.txt",pathToBuiltProject);
var dir = Path.GetDirectoryName(pathToBuiltProject);
File.Copy(dir + "\\PowerFun-Unity_Data\\Plugins\\x86_64\\ANT_WrappedLib.dll", dir + "\\PowerFun-Unity_Data\\Managed\\ANT_WrappedLib.dll");
File.Copy(dir + "\\PowerFun-Unity_Data\\Plugins\\x86_64\\DSI_CP210xManufacturing_3_1.dll", dir + "\\PowerFun-Unity_Data\\Managed\\DSI_CP210xManufacturing_3_1.dll");
File.Copy(dir + "\\PowerFun-Unity_Data\\Plugins\\x86_64\\DSI_SiUSBXp_3_1.dll", dir + "\\PowerFun-Unity_Data\\Managed\\DSI_SiUSBXp_3_1.dll");
File.Copy(dir + "\\PowerFun_Data\\Plugins\\x86_64\\ANT_WrappedLib.dll", dir + "\\PowerFun_Data\\Managed\\ANT_WrappedLib.dll");
File.Copy(dir + "\\PowerFun_Data\\Plugins\\x86_64\\DSI_CP210xManufacturing_3_1.dll", dir + "\\PowerFun_Data\\Managed\\DSI_CP210xManufacturing_3_1.dll");
File.Copy(dir + "\\PowerFun_Data\\Plugins\\x86_64\\DSI_SiUSBXp_3_1.dll", dir + "\\PowerFun_Data\\Managed\\DSI_SiUSBXp_3_1.dll");
}
}

54
Assets/Resources/UI/Prefab/Common/Confirm.prefab
View File

@ -300,6 +300,11 @@ PrefabInstance:
m_Modification:
m_TransformParent: {fileID: 6926614531869201853}
m_Modifications:
- target: {fileID: 545917028276686471, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
type: 3}
propertyPath: m_Pivot.x
@ -413,7 +418,27 @@ PrefabInstance:
- target: {fileID: 3150550772916003707, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
type: 3}
propertyPath: m_Text
value: Yes
value: Ok
objectReference: {fileID: 0}
- target: {fileID: 5329299856310536127, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5329299856310536127, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5329299856310536127, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 20
objectReference: {fileID: 0}
- target: {fileID: 5329299856310536127, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8688565590564084001, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
type: 3}
@ -601,6 +626,11 @@ PrefabInstance:
m_Modification:
m_TransformParent: {fileID: 6926614531869201853}
m_Modifications:
- target: {fileID: 545917028276686471, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
type: 3}
propertyPath: m_Pivot.x
@ -714,7 +744,27 @@ PrefabInstance:
- target: {fileID: 3150550772916003707, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
type: 3}
propertyPath: m_Text
value: CANCEL
value: Cancel
objectReference: {fileID: 0}
- target: {fileID: 5329299856310536127, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5329299856310536127, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5329299856310536127, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 20
objectReference: {fileID: 0}
- target: {fileID: 5329299856310536127, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, type: 3}

14
Assets/Resources/UI/Prefab/MapList/MapItem.prefab
View File

@ -110,10 +110,10 @@ RectTransform:
m_Father: {fileID: 5307116753344173197}
m_RootOrder: 8
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 1, y: 0}
m_AnchorMin: {x: 1, y: 1}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: -12, y: -2}
m_SizeDelta: {x: 28, y: -2}
m_SizeDelta: {x: 28, y: 20}
m_Pivot: {x: 1, y: 1}
--- !u!222 &1325622395784352468
CanvasRenderer:
@ -692,8 +692,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 26, y: -2}
m_SizeDelta: {x: 55, y: 20}
m_AnchoredPosition: {x: 28, y: -2}
m_SizeDelta: {x: 53, y: 20}
m_Pivot: {x: 0, y: 1}
--- !u!222 &5307116753349857061
CanvasRenderer:
@ -918,7 +918,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 166, y: -2}
m_AnchoredPosition: {x: 168, y: -2}
m_SizeDelta: {x: 37, y: 20}
m_Pivot: {x: 0, y: 1}
--- !u!222 &5307116753824956001
@ -1204,8 +1204,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 95, y: -2}
m_SizeDelta: {x: 55, y: 20}
m_AnchoredPosition: {x: 97, y: -2}
m_SizeDelta: {x: 53, y: 20}
m_Pivot: {x: 0, y: 1}
--- !u!222 &5307116754248337036
CanvasRenderer:

51
Assets/Resources/UI/Prefab/Panel/DevicePanel.prefab
View File

@ -1662,17 +1662,17 @@ PrefabInstance:
- target: {fileID: 2665063159965378333, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
type: 3}
propertyPath: m_Color.b
value: 0.7372549
value: 1
objectReference: {fileID: 0}
- target: {fileID: 2665063159965378333, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
type: 3}
propertyPath: m_Color.g
value: 0.6862745
value: 1
objectReference: {fileID: 0}
- target: {fileID: 2665063159965378333, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
type: 3}
propertyPath: m_Color.r
value: 0.6862745
value: 1
objectReference: {fileID: 0}
- target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
type: 3}
@ -1784,6 +1784,51 @@ PrefabInstance:
propertyPath: m_Name
value: CloseBtn
objectReference: {fileID: 0}
- target: {fileID: 3150550772099312291, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
type: 3}
propertyPath: m_Colors.m_NormalColor.b
value: 0.43137255
objectReference: {fileID: 0}
- target: {fileID: 3150550772099312291, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
type: 3}
propertyPath: m_Colors.m_NormalColor.g
value: 0.36078432
objectReference: {fileID: 0}
- target: {fileID: 3150550772099312291, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
type: 3}
propertyPath: m_Colors.m_NormalColor.r
value: 0.36078432
objectReference: {fileID: 0}
- target: {fileID: 3150550772099312291, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
type: 3}
propertyPath: m_Colors.m_PressedColor.b
value: 0.3019608
objectReference: {fileID: 0}
- target: {fileID: 3150550772099312291, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
type: 3}
propertyPath: m_Colors.m_PressedColor.g
value: 0.24313726
objectReference: {fileID: 0}
- target: {fileID: 3150550772099312291, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
type: 3}
propertyPath: m_Colors.m_PressedColor.r
value: 0.23921569
objectReference: {fileID: 0}
- target: {fileID: 3150550772099312291, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
type: 3}
propertyPath: m_Colors.m_SelectedColor.b
value: 1
objectReference: {fileID: 0}
- target: {fileID: 3150550772099312291, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
type: 3}
propertyPath: m_Colors.m_SelectedColor.g
value: 1
objectReference: {fileID: 0}
- target: {fileID: 3150550772099312291, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
type: 3}
propertyPath: m_Colors.m_SelectedColor.r
value: 1
objectReference: {fileID: 0}
- target: {fileID: 3150550772099312291, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
type: 3}
propertyPath: m_Colors.m_HighlightedColor.b

4
Assets/Resources/UI/Prefab/Panel/EditUserPanel.prefab
View File

@ -5220,7 +5220,7 @@ PrefabInstance:
- target: {fileID: 3150550772916003707, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
type: 3}
propertyPath: m_Text
value: CANCEL
value: Cancel
objectReference: {fileID: 0}
- target: {fileID: 5329299856310536127, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
type: 3}
@ -7380,7 +7380,7 @@ PrefabInstance:
- target: {fileID: 3150550772916003707, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
type: 3}
propertyPath: m_Text
value: EDIT
value: Edit
objectReference: {fileID: 0}
- target: {fileID: 5329299856310536127, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
type: 3}

9
Assets/Resources/UI/Prefab/Panel/FeedbackModal.prefab
View File

@ -2818,7 +2818,7 @@ PrefabInstance:
- target: {fileID: 3150550772916003707, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
type: 3}
propertyPath: m_Text
value: CANCEL
value: Cancel
objectReference: {fileID: 0}
- target: {fileID: 5329299856310536127, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
type: 3}
@ -3000,6 +3000,11 @@ PrefabInstance:
propertyPath: m_Name
value: input
objectReference: {fileID: 0}
- target: {fileID: 7204820797918493515, guid: 07e45aecba1a2d542b043157aa2e9322,
type: 3}
propertyPath: m_Text
value: We sincerely look forward to receiving your suggestions......
objectReference: {fileID: 0}
- target: {fileID: 7204820797918493515, guid: 07e45aecba1a2d542b043157aa2e9322,
type: 3}
propertyPath: m_FontData.m_Alignment
@ -3209,7 +3214,7 @@ PrefabInstance:
- target: {fileID: 3150550772916003707, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
type: 3}
propertyPath: m_Text
value: SUBMIT
value: Submit
objectReference: {fileID: 0}
- target: {fileID: 5329299856310536127, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
type: 3}

7
Assets/Resources/UI/Prefab/Panel/HomePanel.prefab
View File

@ -397,7 +397,7 @@ MonoBehaviour:
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: MATCH
m_Text: RACE
--- !u!1 &3931130818808089737
GameObject:
m_ObjectHideFlags: 0
@ -1070,6 +1070,11 @@ PrefabInstance:
propertyPath: m_Color.r
value: 0.61960787
objectReference: {fileID: 0}
- target: {fileID: 4566599628729395002, guid: 652cdefe0475dfd429e5a7e92bc3fa31,
type: 3}
propertyPath: m_Text
value: Total Distance
objectReference: {fileID: 0}
- target: {fileID: 4566599628729395002, guid: 652cdefe0475dfd429e5a7e92bc3fa31,
type: 3}
propertyPath: m_Color.b

16
Assets/Resources/UI/Prefab/Panel/MapListPanel.prefab
View File

@ -292,7 +292,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0.43137255, g: 0.43137255, b: 0.49019608, a: 1}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_Maskable: 1
m_OnCullStateChanged:
@ -387,7 +387,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0.43137255, g: 0.43137255, b: 0.49019608, a: 1}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_Maskable: 1
m_OnCullStateChanged:
@ -568,7 +568,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0.43137255, g: 0.43137255, b: 0.49019608, a: 1}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_Maskable: 1
m_OnCullStateChanged:
@ -663,7 +663,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0.43137255, g: 0.43137255, b: 0.49019608, a: 1}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_Maskable: 1
m_OnCullStateChanged:
@ -758,7 +758,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0.43137255, g: 0.43137255, b: 0.49019608, a: 1}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_Maskable: 1
m_OnCullStateChanged:
@ -1071,7 +1071,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0.43137255, g: 0.43137255, b: 0.49019608, a: 1}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_Maskable: 1
m_OnCullStateChanged:
@ -2019,7 +2019,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0.42352945, g: 0.42352945, b: 0.48235297, a: 1}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_Maskable: 1
m_OnCullStateChanged:
@ -2293,7 +2293,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0.42352945, g: 0.42352945, b: 0.48235297, a: 1}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_Maskable: 1
m_OnCullStateChanged:

8
Assets/Resources/UI/Prefab/Panel/NewsModal.prefab
View File

@ -496,10 +496,10 @@ RectTransform:
m_Father: {fileID: 1496775926840385228}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 1}
m_AnchorMax: {x: 0.5, y: 1}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: -50}
m_SizeDelta: {x: 159, y: 50}
m_SizeDelta: {x: 0, y: 50}
m_Pivot: {x: 0.5, y: 1}
--- !u!222 &1496775926965339623
CanvasRenderer:
@ -541,4 +541,4 @@ MonoBehaviour:
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: NOTIFY
m_Text: NOTIFICATION

9
Assets/Resources/UI/Prefab/Panel/UserInfoPanel.prefab
View File

@ -273,7 +273,7 @@ MonoBehaviour:
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: Total Kilometer
m_Text: Total Distance
--- !u!1 &1879534887716360358
GameObject:
m_ObjectHideFlags: 0
@ -4718,7 +4718,7 @@ MonoBehaviour:
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: Total Calories Burned
m_Text: Total Rides
--- !u!1 &8325193901124955881
GameObject:
m_ObjectHideFlags: 0
@ -5481,6 +5481,11 @@ PrefabInstance:
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8884056309303262662, guid: ed226fe096f17a0459f856db5fc494af,
type: 3}
propertyPath: m_Text
value: RACE
objectReference: {fileID: 0}
- target: {fileID: 8884056309303262662, guid: ed226fe096f17a0459f856db5fc494af,
type: 3}
propertyPath: m_FontData.m_Font

6
Assets/Resources/UI/Prefab/ResultList/RouteItem.prefab
View File

@ -1881,7 +1881,7 @@ PrefabInstance:
- target: {fileID: 3150550772916003707, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
type: 3}
propertyPath: m_Text
value: RIDE AGAIN
value: Ride Again
objectReference: {fileID: 0}
- target: {fileID: 3150550772916003707, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
type: 3}
@ -2056,7 +2056,7 @@ PrefabInstance:
- target: {fileID: 3150550772916003707, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
type: 3}
propertyPath: m_Text
value: CONTINUE
value: Continue
objectReference: {fileID: 0}
- target: {fileID: 3150550772916003707, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
type: 3}
@ -2231,7 +2231,7 @@ PrefabInstance:
- target: {fileID: 3150550772916003707, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
type: 3}
propertyPath: m_Text
value: DELETE
value: Delete
objectReference: {fileID: 0}
- target: {fileID: 3150550772916003707, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
type: 3}

3165
Assets/Scenes/1-Login.unity
View File

File diff suppressed because it is too large Load Diff

8
Assets/Scenes/MainScene.unity
View File

@ -641,7 +641,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
m_IsActive: 1
--- !u!108 &873388894
Light:
m_ObjectHideFlags: 0
@ -649,11 +649,11 @@ Light:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 873388893}
m_Enabled: 0
m_Enabled: 1
serializedVersion: 10
m_Type: 1
m_Shape: 0
m_Color: {r: 1, g: 0.95686275, b: 0.8392157, a: 1}
m_Color: {r: 1, g: 0.9764706, b: 0.5411765, a: 1}
m_Intensity: 1
m_Range: 10
m_SpotAngle: 30
@ -688,7 +688,7 @@ Light:
m_Cookie: {fileID: 0}
m_DrawHalo: 0
m_Flare: {fileID: 0}
m_RenderMode: 0
m_RenderMode: 2
m_CullingMask:
serializedVersion: 2
m_Bits: 4294967295

2
Assets/Scripts/Apis/ApiBase.cs
View File

@ -253,7 +253,7 @@ namespace Assets.Scripts.Apis
//}
var request = (HttpWebRequest)WebRequest.Create(ConfigHelper.Host + url);
request.UserAgent = httpClient.DefaultRequestHeaders.UserAgent.ToString();
request.Headers.Add("Language", "Zh-cn");
request.Headers.Add("Language", "en");
request.CookieContainer = new CookieContainer();
foreach (Cookie item in cookies)
{

2
Assets/Scripts/Apis/ThirdPartApi.cs
View File

@ -26,7 +26,7 @@ namespace Assets.Scripts.Apis
}
public async Task<Stream> GetMapImage(IpToGeoModel locationInfo)
{
return await GetThirdPartStreamAsync($"https://api.mapbox.com/styles/v1/juzetest/ckmkdjwsa1nvt17nr1ps4fqgs/static/{locationInfo.longitude},{locationInfo.latitude},12.14,0/1280x1280?access_token=pk.eyJ1IjoianV6ZXRlc3QiLCJhIjoiY2ttazhsbnpiMGVrdjJucGhyNnh6eXcxYSJ9.6zj2U9eFCNJRMljNlMxjVg");
return await GetThirdPartStreamAsync($"https://api.mapbox.com/styles/v1/juzetest/ckmkdjwsa1nvt17nr1ps4fqgs/static/{locationInfo.longitude},{locationInfo.latitude},12,0/1280x1280?access_token=pk.eyJ1IjoianV6ZXRlc3QiLCJhIjoiY2ttazhsbnpiMGVrdjJucGhyNnh6eXcxYSJ9.6zj2U9eFCNJRMljNlMxjVg");
//pk.eyJ1IjoiYW5keXNqdCIsImEiOiJja2ZhajE5OGwwamRiMnltcW96bHk0ZWFuIn0.GvKanc6UveWSvIjS9HfBPA
//pk.eyJ1IjoiYW5keXNqdCIsImEiOiJja2ZhajE5OGwwamRiMnltcW96bHk0ZWFuIn0.GvKanc6UveWSvIjS9HfBPA
}

2
Assets/Scripts/App.cs
View File

@ -7,7 +7,7 @@ using UnityEngine;
public static class App
{
public static string Host = "http://192.168.0.101:5082/";
public static string Host = "http://192.168.0.97:5082/";
public static string AppVersion = "1.0.0";

35
Assets/Scripts/Scenes/LoginController.cs
View File

@ -353,18 +353,28 @@ public class LoginController : MonoBehaviour
{
UIManager.AddEvent(wxLogin3.Find("return").gameObject, EventTriggerType.PointerClick, (b) =>
{
StartScrollPanel(1);
//if (signContainer.gameObject.activeSelf)
//{
// StartScrollPanel(3);
//}
//else
//{
// signContainer.gameObject.SetActive(true);
// pageNums = 4;
// //wxLogin3.gameObject.SetActive(false);
// StartScrollPanel(1);
//}
if (signContainer.gameObject.activeSelf)
{
if (pageNums == 5)
{
StartScrollPanel(3);
}
else if (pageNums == 4)
{
StartScrollPanel(2);
}
else
{
StartScrollPanel(1);
}
}
else
{
signContainer.gameObject.SetActive(true);
pageNums = 4;
//wxLogin3.gameObject.SetActive(false);
StartScrollPanel(1);
}
});
UIManager.AddEvent(wxLogin3.Find("rememberButton").gameObject, EventTriggerType.PointerClick, (b) =>
{
@ -500,6 +510,7 @@ public class LoginController : MonoBehaviour
document.getElementsByClassName('qrcode')[0].style.marginTop = 0;
document.getElementsByClassName('title')[0].style.display = 'none';
document.getElementById('wx_default_tip').childNodes[3].innerHTML = `""PowerFun""`;
document.body.style.background = '#272732';
document.body.style.overflow = 'hidden';
document.body.style.transformOrigin = 'top left';

2
Assets/Scripts/UI/Prefab/MapList/MapFilterOptions.cs
View File

@ -40,7 +40,7 @@ namespace Assets.Scripts.UI.Prefab.MapList
{"HC","750-99999" },
};
public static List<Dropdown.OptionData> sorts = new string[] {
"Hot","Name","Distance","Difficulty"//,"Times"
"Trend","Name","Distance","Difficulty"//,"Times"
}.Select(x => new Dropdown.OptionData(x)).ToList();
public static Dictionary<string, string> diffDisplayDict = new Dictionary<string, string>()
{

2
Assets/Scripts/UI/Prefab/MapList/RotateBg.cs
View File

@ -13,6 +13,6 @@ public class RotateBg : MonoBehaviour
// Update is called once per frame
void Update()
{
transform.Rotate(new Vector3(0,0,-Time.deltaTime * 1/4));
transform.Rotate(new Vector3(0,0,-Time.deltaTime * 1/6));
}
}

8
Assets/Scripts/UI/Prefab/Panel/BigMapController.cs
View File

@ -75,7 +75,7 @@ public class BigMapController : PFUIPanel
mapManager.OnUpdated += MapManager_OnUpdated;
//// mapManager.OnTileFinished += MapManager_OnTileFinished;
mapManager.SetZoom(7);
mapManager.SetZoom(5.8f);
//mapManager.SetCenterLatitudeLongitude(new Mapbox.Utils.Vector2d(32.051203, 118.771572));
this.transform.Find("Map").GetComponent<QuadTreeCameraMovement>()._referenceCamera = Camera.main;
@ -179,12 +179,12 @@ public class BigMapController : PFUIPanel
}
private void MapManager_OnUpdated()
{
Debug.Log("update");
Debug.Log("update "+ mapManager.Zoom);
if(mapManager.Zoom <= 6)
if(mapManager.Zoom <= 4.8)
{
mapManager.OnUpdated -= MapManager_OnUpdated;
maskImage.gameObject.SetActive(true);
maskImage.DOFade(1f, 0.9f).SetEase(Ease.InSine).OnComplete(() =>
{

6
Assets/Scripts/UI/Prefab/Panel/MapListController.cs
View File

@ -96,7 +96,7 @@ public class MapListController : PFUIPanel
{
ColorUtility.TryParseHtmlString("#6E6E7D", out Color c);
image.color = c1;
text.color = c;
text.color = new Color(1, 1, 1, 1);
hands.Remove(MapFilterOptions.diffDict[text.text]);
}
scroll.GetComponent<ScrollRect>().verticalNormalizedPosition = 1;
@ -174,6 +174,10 @@ public class MapListController : PFUIPanel
drop.onValueChanged.AddListener((int index)=>
{
sort = drop.options[index].text;
if (sort == "Trend")
{
sort = "Hot";
}
var image = sortDir.Find("Image").GetComponent<Image>();
image.sprite = Resources.Load<Sprite>("Images/DOWN");
sortDire = "desc";

4
Assets/Scripts/UI/Prefab/Panel/UserInfoController.cs
View File

@ -61,6 +61,10 @@ public class UserInfoController : PFUIPanel
{
base.Show();
Load();
if (summaryPanel != null)
{
summaryPanel.Find("Panel").Find("RideResultList").GetComponent<ResultListController>().HideError();
}
}
void Load()
{

9
Assets/Scripts/UI/Prefab/ResultList/ResultListController.cs
View File

@ -79,6 +79,14 @@ public class ResultListController : MonoBehaviour
GetList(1);
}
public void HideError()
{
if (scroll!=null)
{
scroll.transform.Find("Error").gameObject.SetActive(false);
}
}
private void OnEndDrag(BaseEventData e)
{
ScrollRect scrollrect = null;
@ -102,7 +110,6 @@ public class ResultListController : MonoBehaviour
Refresh(contents[scrollIndex]);
}
}
private void Refresh(Transform content)
{
content.transform.DestroyChildren();