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

英文版本，pc分享功能，移动端fb分享，修改细节

Browse Source
This commit is contained in:
CaiYanPeng 2022-02-22 18:11:26 +08:00
parent 2c7d02ec9a
commit 768f8261da
13 changed files with 322 additions and 216 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Assets/RecommendController.cs
View File

@ -25,7 +25,9 @@ public class RecommendController : MonoBehaviour
public void Initial(Recommand area, Dictionary<string, Texture> caches = null)
{
transform.Find("Panel/Text").GetComponent<Text>().text = area.Title;
transform.Find("Panel/Text").GetComponent<Text>().text = App.GetLocalLanguage() == "zh" ? area.Title : area.GlobeTitle; ;
Utils.DisplayImageTempDict(GetComponent<RawImage>(), area.CoverImage, caches);
this.Area = area;
GetComponent<Button>().onClick.RemoveAllListeners();

6
Assets/Resources/UI/Prefab/Panel/ActivityAdPanel.prefab
View File

@ -298,8 +298,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 92.5, y: 131.5}
m_SizeDelta: {x: 29, y: 31}
m_AnchoredPosition: {x: 152, y: 251.5}
m_SizeDelta: {x: 46, y: 49}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &525523089472465306
CanvasRenderer:
@ -714,7 +714,7 @@ RectTransform:
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 365, y: 365}
m_SizeDelta: {x: 584, y: 584}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6322400348156303082
CanvasRenderer:

174
Assets/Resources/UI/Prefab/Panel/ActivityPanel.prefab
View File

@ -1,74 +1,5 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &8017954798751087357
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 8017954798751087356}
- component: {fileID: 8017954798751087358}
- component: {fileID: 8017954798751087359}
m_Layer: 5
m_Name: Browser
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &8017954798751087356
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8017954798751087357}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 8017954799840778711}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8017954798751087358
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8017954798751087357}
m_CullTransparentMesh: 0
--- !u!114 &8017954798751087359
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8017954798751087357}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 598e18fb001004a81960f552978ecf4e, type: 3}
m_Name:
m_EditorClassIdentifier:
urlOnStart:
showOnStart: 0
fullScreen: 0
useToolbar: 0
toolbarPosition: 0
frame:
serializedVersion: 2
x: 0
y: 0
width: 844
height: 390
referenceRectTransform: {fileID: 8017954798751087356}
--- !u!1 &8017954799840778708
GameObject:
m_ObjectHideFlags: 0
@ -99,7 +30,7 @@ RectTransform:
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 8017954798751087356}
- {fileID: 3856321360136236464}
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -158,3 +89,106 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
newNav: {fileID: 0}
--- !u!1001 &3856321360158360446
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 8017954799840778711}
m_Modifications:
- target: {fileID: 145848, guid: d2b6f4719f2a1e34f9bdeb0cae87bddd, type: 3}
propertyPath: m_Name
value: Browser
objectReference: {fileID: 0}
- target: {fileID: 22441678, guid: d2b6f4719f2a1e34f9bdeb0cae87bddd, type: 3}
propertyPath: m_Pivot.x
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 22441678, guid: d2b6f4719f2a1e34f9bdeb0cae87bddd, type: 3}
propertyPath: m_Pivot.y
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 22441678, guid: d2b6f4719f2a1e34f9bdeb0cae87bddd, type: 3}
propertyPath: m_RootOrder
value: 0
objectReference: {fileID: 0}
- target: {fileID: 22441678, guid: d2b6f4719f2a1e34f9bdeb0cae87bddd, type: 3}
propertyPath: m_AnchorMax.x
value: 1
objectReference: {fileID: 0}
- target: {fileID: 22441678, guid: d2b6f4719f2a1e34f9bdeb0cae87bddd, type: 3}
propertyPath: m_AnchorMax.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 22441678, guid: d2b6f4719f2a1e34f9bdeb0cae87bddd, type: 3}
propertyPath: m_AnchorMin.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 22441678, guid: d2b6f4719f2a1e34f9bdeb0cae87bddd, type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 22441678, guid: d2b6f4719f2a1e34f9bdeb0cae87bddd, type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 22441678, guid: d2b6f4719f2a1e34f9bdeb0cae87bddd, type: 3}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 22441678, guid: d2b6f4719f2a1e34f9bdeb0cae87bddd, type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 22441678, guid: d2b6f4719f2a1e34f9bdeb0cae87bddd, type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 22441678, guid: d2b6f4719f2a1e34f9bdeb0cae87bddd, type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 22441678, guid: d2b6f4719f2a1e34f9bdeb0cae87bddd, type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 22441678, guid: d2b6f4719f2a1e34f9bdeb0cae87bddd, type: 3}
propertyPath: m_LocalRotation.x
value: -0
objectReference: {fileID: 0}
- target: {fileID: 22441678, guid: d2b6f4719f2a1e34f9bdeb0cae87bddd, type: 3}
propertyPath: m_LocalRotation.y
value: -0
objectReference: {fileID: 0}
- target: {fileID: 22441678, guid: d2b6f4719f2a1e34f9bdeb0cae87bddd, type: 3}
propertyPath: m_LocalRotation.z
value: -0
objectReference: {fileID: 0}
- target: {fileID: 22441678, guid: d2b6f4719f2a1e34f9bdeb0cae87bddd, type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 22441678, guid: d2b6f4719f2a1e34f9bdeb0cae87bddd, type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 22441678, guid: d2b6f4719f2a1e34f9bdeb0cae87bddd, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 22441678, guid: d2b6f4719f2a1e34f9bdeb0cae87bddd, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 22441678, guid: d2b6f4719f2a1e34f9bdeb0cae87bddd, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: d2b6f4719f2a1e34f9bdeb0cae87bddd, type: 3}
--- !u!224 &3856321360136236464 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 22441678, guid: d2b6f4719f2a1e34f9bdeb0cae87bddd,
type: 3}
m_PrefabInstance: {fileID: 3856321360158360446}
m_PrefabAsset: {fileID: 0}

237
Assets/Resources/UI/Prefab/Panel/AddressPanel.prefab
View File

@ -1,5 +1,44 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &3259611887761459577
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3203476855229003560}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: e47f6ee11b78f3247a0b474b6c36e2cd, type: 3}
m_Name:
m_EditorClassIdentifier:
key:
--- !u!114 &3259611887791627042
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3203476855273317745}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: e47f6ee11b78f3247a0b474b6c36e2cd, type: 3}
m_Name:
m_EditorClassIdentifier:
key:
--- !u!114 &3259611886976105659
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3203476856626758378}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: e47f6ee11b78f3247a0b474b6c36e2cd, type: 3}
m_Name:
m_EditorClassIdentifier:
key:
--- !u!1 &3259611886134673286
GameObject:
m_ObjectHideFlags: 0
@ -128,7 +167,7 @@ RectTransform:
m_AnchorMin: {x: 0.5, y: 1}
m_AnchorMax: {x: 0.5, y: 1}
m_AnchoredPosition: {x: 0, y: -20}
m_SizeDelta: {x: 192, y: 34}
m_SizeDelta: {x: 240, y: 40}
m_Pivot: {x: 0.5, y: 1}
--- !u!222 &3259611886444328230
CanvasRenderer:
@ -159,12 +198,12 @@ MonoBehaviour:
m_Calls: []
m_FontData:
m_Font: {fileID: 12800000, guid: 1db9e217733971041be26b076fda6083, type: 3}
m_FontSize: 24
m_FontSize: 32
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 2
m_MaxSize: 40
m_Alignment: 4
m_Alignment: 1
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 0
@ -272,6 +311,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 6337a1358d5d95f4293c650d8486815d, type: 3}
m_Name:
m_EditorClassIdentifier:
newNav: {fileID: 0}
--- !u!1 &3259611886910183586
GameObject:
m_ObjectHideFlags: 0
@ -339,7 +379,7 @@ MonoBehaviour:
m_Calls: []
m_FontData:
m_Font: {fileID: 12800000, guid: 1db9e217733971041be26b076fda6083, type: 3}
m_FontSize: 12
m_FontSize: 14
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 1
@ -400,7 +440,7 @@ RectTransform:
m_AnchorMin: {x: 1, y: 1}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: -25, y: -25}
m_SizeDelta: {x: 24, y: 24}
m_SizeDelta: {x: 35, y: 35}
m_Pivot: {x: 1, y: 1}
--- !u!222 &3259611886915971969
CanvasRenderer:
@ -516,35 +556,9 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 30, y: -127}
m_SizeDelta: {x: 364, y: 87}
m_AnchoredPosition: {x: 30, y: -186}
m_SizeDelta: {x: 530, y: 122}
m_Pivot: {x: 0, y: 1}
--- !u!114 &3259611886976105658
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3776101893418036694}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: e47f6ee11b78f3247a0b474b6c36e2cd, type: 3}
m_Name:
m_EditorClassIdentifier:
key:
--- !u!114 &3259611886976105659
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3203476856626758378}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: e47f6ee11b78f3247a0b474b6c36e2cd, type: 3}
m_Name:
m_EditorClassIdentifier:
key:
--- !u!1 &3259611887540860173
GameObject:
m_ObjectHideFlags: 0
@ -579,8 +593,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: 30, y: -61}
m_SizeDelta: {x: 172, y: 54}
m_AnchoredPosition: {x: 30, y: -96}
m_SizeDelta: {x: 250, y: 74}
m_Pivot: {x: 0, y: 1}
--- !u!1 &3259611887564191260
GameObject:
@ -616,8 +630,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: 222, y: -61}
m_SizeDelta: {x: 172, y: 54}
m_AnchoredPosition: {x: 310, y: -96}
m_SizeDelta: {x: 250, y: 74}
m_Pivot: {x: 0, y: 1}
--- !u!1 &3259611887593103516
GameObject:
@ -686,7 +700,7 @@ MonoBehaviour:
m_Calls: []
m_FontData:
m_Font: {fileID: 12800000, guid: 1db9e217733971041be26b076fda6083, type: 3}
m_FontSize: 12
m_FontSize: 14
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 1
@ -711,58 +725,6 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
key:
--- !u!114 &3259611887761459576
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3776101892190165012}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: e47f6ee11b78f3247a0b474b6c36e2cd, type: 3}
m_Name:
m_EditorClassIdentifier:
key:
--- !u!114 &3259611887761459577
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3203476855229003560}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: e47f6ee11b78f3247a0b474b6c36e2cd, type: 3}
m_Name:
m_EditorClassIdentifier:
key:
--- !u!114 &3259611887791627042
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3203476855273317745}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: e47f6ee11b78f3247a0b474b6c36e2cd, type: 3}
m_Name:
m_EditorClassIdentifier:
key:
--- !u!114 &3259611887791627041
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3776101892085549645}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: e47f6ee11b78f3247a0b474b6c36e2cd, type: 3}
m_Name:
m_EditorClassIdentifier:
key:
--- !u!1 &3259611887808822902
GameObject:
m_ObjectHideFlags: 0
@ -805,7 +767,7 @@ RectTransform:
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 424, y: 284}
m_SizeDelta: {x: 590, y: 392}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3259611887808822898
CanvasRenderer:
@ -857,6 +819,45 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
radius: 20
--- !u!114 &3259611887791627041
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3776101892085549645}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: e47f6ee11b78f3247a0b474b6c36e2cd, type: 3}
m_Name:
m_EditorClassIdentifier:
key:
--- !u!114 &3259611887761459576
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3776101892190165012}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: e47f6ee11b78f3247a0b474b6c36e2cd, type: 3}
m_Name:
m_EditorClassIdentifier:
key:
--- !u!114 &3259611886976105658
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3776101893418036694}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: e47f6ee11b78f3247a0b474b6c36e2cd, type: 3}
m_Name:
m_EditorClassIdentifier:
key:
--- !u!1001 &3259611886400011428
PrefabInstance:
m_ObjectHideFlags: 0
@ -907,7 +908,7 @@ PrefabInstance:
- target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
type: 3}
propertyPath: m_SizeDelta.x
value: 114
value: 168
objectReference: {fileID: 0}
- target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
type: 3}
@ -957,7 +958,7 @@ PrefabInstance:
- target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
type: 3}
propertyPath: m_AnchoredPosition.y
value: -226
value: -324
objectReference: {fileID: 0}
- target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
type: 3}
@ -1043,7 +1044,7 @@ PrefabInstance:
- target: {fileID: 3608523562535466787, guid: 07e45aecba1a2d542b043157aa2e9322,
type: 3}
propertyPath: m_AnchorMax.x
value: 0
value: 1
objectReference: {fileID: 0}
- target: {fileID: 3608523562535466787, guid: 07e45aecba1a2d542b043157aa2e9322,
type: 3}
@ -1058,17 +1059,17 @@ PrefabInstance:
- target: {fileID: 3608523562535466787, guid: 07e45aecba1a2d542b043157aa2e9322,
type: 3}
propertyPath: m_AnchorMin.y
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3608523562535466787, guid: 07e45aecba1a2d542b043157aa2e9322,
type: 3}
propertyPath: m_SizeDelta.x
value: 364
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3608523562535466787, guid: 07e45aecba1a2d542b043157aa2e9322,
type: 3}
propertyPath: m_SizeDelta.y
value: 66
value: -26
objectReference: {fileID: 0}
- target: {fileID: 3608523562535466787, guid: 07e45aecba1a2d542b043157aa2e9322,
type: 3}
@ -1128,7 +1129,7 @@ PrefabInstance:
- target: {fileID: 3608523562535466787, guid: 07e45aecba1a2d542b043157aa2e9322,
type: 3}
propertyPath: m_AnchoredPosition.y
value: -21
value: -26
objectReference: {fileID: 0}
- target: {fileID: 3608523562535466787, guid: 07e45aecba1a2d542b043157aa2e9322,
type: 3}
@ -1163,7 +1164,7 @@ PrefabInstance:
- target: {fileID: 7204820797918493515, guid: 07e45aecba1a2d542b043157aa2e9322,
type: 3}
propertyPath: m_FontData.m_FontSize
value: 12
value: 14
objectReference: {fileID: 0}
- target: {fileID: 7204820797918493515, guid: 07e45aecba1a2d542b043157aa2e9322,
type: 3}
@ -1178,7 +1179,7 @@ PrefabInstance:
- target: {fileID: 7511924356665468489, guid: 07e45aecba1a2d542b043157aa2e9322,
type: 3}
propertyPath: m_FontData.m_FontSize
value: 12
value: 14
objectReference: {fileID: 0}
- target: {fileID: 7511924356665468489, guid: 07e45aecba1a2d542b043157aa2e9322,
type: 3}
@ -1285,7 +1286,7 @@ PrefabInstance:
- target: {fileID: 3608523562535466787, guid: 07e45aecba1a2d542b043157aa2e9322,
type: 3}
propertyPath: m_AnchorMax.x
value: 0
value: 1
objectReference: {fileID: 0}
- target: {fileID: 3608523562535466787, guid: 07e45aecba1a2d542b043157aa2e9322,
type: 3}
@ -1300,17 +1301,17 @@ PrefabInstance:
- target: {fileID: 3608523562535466787, guid: 07e45aecba1a2d542b043157aa2e9322,
type: 3}
propertyPath: m_AnchorMin.y
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3608523562535466787, guid: 07e45aecba1a2d542b043157aa2e9322,
type: 3}
propertyPath: m_SizeDelta.x
value: 172
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3608523562535466787, guid: 07e45aecba1a2d542b043157aa2e9322,
type: 3}
propertyPath: m_SizeDelta.y
value: 33
value: -26
objectReference: {fileID: 0}
- target: {fileID: 3608523562535466787, guid: 07e45aecba1a2d542b043157aa2e9322,
type: 3}
@ -1370,7 +1371,7 @@ PrefabInstance:
- target: {fileID: 3608523562535466787, guid: 07e45aecba1a2d542b043157aa2e9322,
type: 3}
propertyPath: m_AnchoredPosition.y
value: -21
value: -26
objectReference: {fileID: 0}
- target: {fileID: 3608523562535466787, guid: 07e45aecba1a2d542b043157aa2e9322,
type: 3}
@ -1405,7 +1406,7 @@ PrefabInstance:
- target: {fileID: 7204820797918493515, guid: 07e45aecba1a2d542b043157aa2e9322,
type: 3}
propertyPath: m_FontData.m_FontSize
value: 12
value: 14
objectReference: {fileID: 0}
- target: {fileID: 7511924356665468489, guid: 07e45aecba1a2d542b043157aa2e9322,
type: 3}
@ -1415,7 +1416,7 @@ PrefabInstance:
- target: {fileID: 7511924356665468489, guid: 07e45aecba1a2d542b043157aa2e9322,
type: 3}
propertyPath: m_FontData.m_FontSize
value: 12
value: 14
objectReference: {fileID: 0}
- target: {fileID: 7789118244628022189, guid: 07e45aecba1a2d542b043157aa2e9322,
type: 3}
@ -1487,7 +1488,7 @@ PrefabInstance:
- target: {fileID: 3608523562535466787, guid: 07e45aecba1a2d542b043157aa2e9322,
type: 3}
propertyPath: m_AnchorMax.x
value: 0
value: 1
objectReference: {fileID: 0}
- target: {fileID: 3608523562535466787, guid: 07e45aecba1a2d542b043157aa2e9322,
type: 3}
@ -1502,17 +1503,17 @@ PrefabInstance:
- target: {fileID: 3608523562535466787, guid: 07e45aecba1a2d542b043157aa2e9322,
type: 3}
propertyPath: m_AnchorMin.y
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3608523562535466787, guid: 07e45aecba1a2d542b043157aa2e9322,
type: 3}
propertyPath: m_SizeDelta.x
value: 172
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3608523562535466787, guid: 07e45aecba1a2d542b043157aa2e9322,
type: 3}
propertyPath: m_SizeDelta.y
value: 33
value: -26
objectReference: {fileID: 0}
- target: {fileID: 3608523562535466787, guid: 07e45aecba1a2d542b043157aa2e9322,
type: 3}
@ -1572,7 +1573,7 @@ PrefabInstance:
- target: {fileID: 3608523562535466787, guid: 07e45aecba1a2d542b043157aa2e9322,
type: 3}
propertyPath: m_AnchoredPosition.y
value: -21
value: -26
objectReference: {fileID: 0}
- target: {fileID: 3608523562535466787, guid: 07e45aecba1a2d542b043157aa2e9322,
type: 3}
@ -1607,7 +1608,7 @@ PrefabInstance:
- target: {fileID: 7204820797918493515, guid: 07e45aecba1a2d542b043157aa2e9322,
type: 3}
propertyPath: m_FontData.m_FontSize
value: 12
value: 14
objectReference: {fileID: 0}
- target: {fileID: 7511924356665468489, guid: 07e45aecba1a2d542b043157aa2e9322,
type: 3}
@ -1617,7 +1618,7 @@ PrefabInstance:
- target: {fileID: 7511924356665468489, guid: 07e45aecba1a2d542b043157aa2e9322,
type: 3}
propertyPath: m_FontData.m_FontSize
value: 12
value: 14
objectReference: {fileID: 0}
- target: {fileID: 7789118244628022189, guid: 07e45aecba1a2d542b043157aa2e9322,
type: 3}
@ -1646,9 +1647,9 @@ PrefabInstance:
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 07e45aecba1a2d542b043157aa2e9322, type: 3}
--- !u!1 &3776101892085549645 stripped
--- !u!1 &3203476855273317745 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 1827088261433348456, guid: 07e45aecba1a2d542b043157aa2e9322,
m_CorrespondingSourceObject: {fileID: 92744388873403988, guid: 07e45aecba1a2d542b043157aa2e9322,
type: 3}
m_PrefabInstance: {fileID: 3259611887791627045}
m_PrefabAsset: {fileID: 0}
@ -1658,9 +1659,9 @@ RectTransform:
type: 3}
m_PrefabInstance: {fileID: 3259611887791627045}
m_PrefabAsset: {fileID: 0}
--- !u!1 &3203476855273317745 stripped
--- !u!1 &3776101892085549645 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 92744388873403988, guid: 07e45aecba1a2d542b043157aa2e9322,
m_CorrespondingSourceObject: {fileID: 1827088261433348456, guid: 07e45aecba1a2d542b043157aa2e9322,
type: 3}
m_PrefabInstance: {fileID: 3259611887791627045}
m_PrefabAsset: {fileID: 0}

2
Assets/Scenes/Test2.unity
View File

@ -134,7 +134,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 11479464, guid: d2b6f4719f2a1e34f9bdeb0cae87bddd, type: 3}
propertyPath: _url
value: http://192.168.0.101:3081/Activity/LightUpChina?Token=2716E2228BA6D646C9A144C1463C0DD2AA10700ABA3358D91424EC32634F64DC74E376AC2211A0641C3C7E23B0FC43207AACA2DA8ACA2893028C1D898C8FE30224A72C974C09FF99D815FD77694B3CD8B28420BA6CAC0B17D4A636535B81759067F0CC7450E24BDE12CB0D48C17526363E7334C82F89930D3251F295EAAF41E5
value: https://www.baidu.com/
objectReference: {fileID: 0}
- target: {fileID: 11479464, guid: d2b6f4719f2a1e34f9bdeb0cae87bddd, type: 3}
propertyPath: _width

1
Assets/Scripts/Apis/Models/ActivityModel.cs
View File

@ -57,5 +57,6 @@ namespace Assets.Scripts.Apis.Models
/// </summary>
public double TotalTicks { get; set; }
public string Url { get; set; }
public string GlobalDetailUrl { get; set; }
}
}

1
Assets/Scripts/Apis/Models/Recommand.cs
View File

@ -29,5 +29,6 @@ namespace Assets.Scripts.Apis.Models
/// </summary>
public string Url { get; set; }
public int? ActivityId { get; set; }
public string GlobeTitle { get; set; }
}
}

2
Assets/Scripts/Scenes/MainController.cs
View File

@ -351,7 +351,7 @@ public class MainController : BaseScene
App.adQueue.Enqueue(_ad);
}
var ad = App.adQueue.Dequeue();
UIManager.ShowActivityAdPanel(ad.Id, ad.DetailUrl, ad.Url + $"?Token={App.CurrentUser.cookie}");
UIManager.ShowActivityAdPanel(ad.Id, App.GetLocalLanguage() == "zh"? ad.DetailUrl: ad.GlobalDetailUrl, ad.Url + $"?Token={App.CurrentUser.cookie}");
}
}

103
Assets/Scripts/UI/Prefab/Activity/ActivityController.cs
View File

@ -6,25 +6,84 @@ using System.Collections;
using System.Collections.Generic;
using UnityEngine;
using UnityEngine.SceneManagement;
#if UNITY_STANDALONE_WIN
using ZenFulcrum.EmbeddedBrowser;
#endif
public class ActivityController : PFUIPanel
{
Transform browser;
#if UNITY_STANDALONE_WIN
Browser webView;
#else
UniWebView webView;
#endif
protected override void Awake()
{
this.url = null;
browser = transform.Find("Browser");
#if UNITY_STANDALONE_WIN
webView = browser.GetComponent<Browser>();
webView.onLoad -= RegisterFunc;
webView.onLoad += RegisterFunc;
#if UNITY_EDITOR
webView.ShowDevTools(true);
#endif
#else
webView = browser.GetComponent<UniWebView>();
#endif
//webView.Show();
}
#if UNITY_STANDALONE_WIN
private void RegisterFunc(JSONNode obj)
{
RunJavaScript($"navigator.pfLang = '{App.GetLocalLanguage()}';");
webView.RegisterFunction("Close", args =>
{
Debug.Log("执行返回");
CloseFunc();
});
webView.RegisterFunction("StartRide", args =>
{
if (args.Count == 2)
{
StartRide((int)args[0], args[1]);
}
});
webView.RegisterFunction("OpenUrl", args =>
{
if (args.Count == 1)
{
OpenUrl(args[0]);
}
});
webView.RegisterFunction("Share", args =>
{
if (args.Count == 2)
{
Share((int)args[0], (int)args[1]);
}
});
}
#endif
public override void Show()
{
base.Show();
//Debug.Log(20);
//Invoke("StartPageFunc",0.5f);
}
#if UNITY_STANDALONE_WIN
private void StartPageFunc(Action action = null)
{
if (action == null)
{
webView.LoadURL(url, true);
}
else
{
action.Invoke();
}
}
#else
private void StartPageFunc(Action action = null)
{
Debug.Log("开始");
@ -51,23 +110,21 @@ public class ActivityController : PFUIPanel
switch (message.Path)
{
case "Close": CloseFunc(); break;
case "StartRide": StartRide(message.Args); break;
case "Share": Share(message.Args); break;
case "OpenUrl": OpenUrl(message.Args); break;
case "StartRide": StartRide(int.Parse(message.Args["id"]),message.Args.ContainsKey("routeResult")?message.Args["routeResult"]:null); break;
case "Share": Share(int.Parse(message.Args["type"]),int.Parse(message.Args["id"])); break;
case "OpenUrl": OpenUrl(message.Args["url"]); break;
default:break;
}
}
#endif
private void OpenUrl(Dictionary<string, string> args)
private void OpenUrl(string url)
{
Application.OpenURL(System.Net.WebUtility.UrlDecode(args["url"]));
Application.OpenURL(System.Net.WebUtility.UrlDecode(url));
}
private void Share(Dictionary<string, string> args)
private void Share(int type,int id)
{
int type = int.Parse(args["type"]);
int id = int.Parse(args["id"]);
string url = $"http://192.168.0.101:3081/Activity/LightUpChina/Share?userId={App.CurrentUser.Id}";
if (type < 2)
{
@ -76,21 +133,26 @@ public class ActivityController : PFUIPanel
App.weChatController.ShareWebpageToWX(type, url, "点亮中国活动", "by " + App.CurrentUser.Nickname, null);
}
}
else
else if (type == 2)
{
UnityEngine.GUIUtility.systemCopyBuffer = url;
RunJavaScript("window.postMessage(\"webview;复制成功\")");
}
else
{
Facebook.Unity.FB.ShareLink(contentURL: new Uri(url),
contentTitle: "点亮中国活动",
contentDescription: "By " + App.CurrentUser.Nickname,
photoURL: new Uri(App.CurrentUser.WxHeadImg));
}
}
private void StartRide(Dictionary<string, string> args)
private void StartRide(int id,string routeResult)
{
var id = int.Parse(args["id"]);
App.RouteIdParam = id;
if (args.ContainsKey("routeResult"))
if (routeResult!=null)
{
Debug.Log(args.ContainsKey("routeResult"));
App.routeResult = JsonConvert.DeserializeObject<RouteResult>(args["routeResult"]);
App.routeResult = JsonConvert.DeserializeObject<RouteResult>(routeResult);
}
SceneManager.LoadScene("Ride");
}
@ -103,7 +165,11 @@ public class ActivityController : PFUIPanel
private void RunJavaScript(string js)
{
#if UNITY_STANDALONE_WIN
webView.EvalJS(js);
#else
browser.GetComponent<UniWebView>().EvaluateJavaScript(js);
#endif
}
// Update is called once per frame
void Update()
@ -127,5 +193,6 @@ public class ActivityController : PFUIPanel
RunJavaScript("window.postMessage(\"webview;Refresh\")");
});
}
}
}

1
Assets/test.cs
View File

@ -9,6 +9,7 @@ public class test : MonoBehaviour
void Start()
{
var b = transform.Find("Browser (GUI)").GetComponent<Browser>();
b.EvalJS("navigator.pfLang = 'zh'");
b.RegisterFunction("Test", args =>
{

4
ProjectSettings/EditorBuildSettings.asset
View File

@ -6,8 +6,8 @@ EditorBuildSettings:
serializedVersion: 2
m_Scenes:
- enabled: 1
path: Assets/Scenes/Login-Mobile.unity
guid: 4be878da00cf764499988cf403faf94d
path: Assets/Scenes/Login.unity
guid: 6dce3e17997730b4492f91dd8fede429
- enabled: 1
path: Assets/Scenes/MainScene.unity
guid: ab586a3c1bacd4a48a55178eb06fe0cc

1
ProjectSettings/GraphicsSettings.asset
View File

@ -38,7 +38,6 @@ GraphicsSettings:
- {fileID: 16000, guid: 0000000000000000f000000000000000, type: 0}
- {fileID: 16001, guid: 0000000000000000f000000000000000, type: 0}
- {fileID: 17000, guid: 0000000000000000f000000000000000, type: 0}
- {fileID: 16003, guid: 0000000000000000f000000000000000, type: 0}
m_PreloadedShaders: []
m_SpritesDefaultMaterial: {fileID: 10754, guid: 0000000000000000f000000000000000,
type: 0}

2
ProjectSettings/ProjectSettings.asset
View File

@ -91,7 +91,7 @@ PlayerSettings:
resizableWindow: 0
useMacAppStoreValidation: 0
macAppStoreCategory: public.app-category.games
gpuSkinning: 1
gpuSkinning: 0
xboxPIXTextureCapture: 0
xboxEnableAvatar: 0
xboxEnableKinect: 0