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

# Conflicts:
#	Assets/Scripts/App.cs

Assets/RecommendController.cs

@@ -50,7 +50,15 @@ public class RecommendController : MonoBehaviour
                 UIManager.ShowNewRouteDetailPanel(res.data.Id);
                 break;
             case 2:
-                Application.OpenURL(Area.Url);
+                await ConfigHelper.activityApi.JoinActivity(Area.ActivityId ?? 0);
+                if (string.IsNullOrEmpty(App.CurrentUser.Contact) || string.IsNullOrEmpty(App.CurrentUser.ContactPhone) || string.IsNullOrEmpty(App.CurrentUser.ContactAddress))
+                {
+                    UIManager.ShowAddressPanel();
+                }
+                else 
+                {
+                    UIManager.ShowActivityPanel(Area.Url + "?Token=" + App.CurrentUser.cookie);
+                }
                 break;
             case 3:
                 App.RouteIdParam = Area.RouteId;

Assets/Resources/Images/点亮中国.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 7f8579c513fb13a4db67bf938189d166
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Resources/Images/点亮中国/灯笼.png.meta

@@ -0,0 +1,128 @@
+fileFormatVersion: 2
+guid: eec60a5beae78fa4ea9d0db5cdf39d06
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 11
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: -1
+    aniso: -1
+    mipBias: -100
+    wrapU: 1
+    wrapV: 1
+    wrapW: -1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  applyGammaDecoding: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Resources/Images/点亮中国/灯笼关闭.png.meta

@@ -0,0 +1,128 @@
+fileFormatVersion: 2
+guid: d1b6b675814203941b27cd80999b11cf
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 11
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: -1
+    aniso: -1
+    mipBias: -100
+    wrapU: 1
+    wrapV: 1
+    wrapW: -1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  applyGammaDecoding: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Resources/Images/点亮中国/灯笼按钮.png.meta

@@ -0,0 +1,128 @@
+fileFormatVersion: 2
+guid: 09d9c1abb2bfef544b4327484ce583aa
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 11
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: -1
+    aniso: -1
+    mipBias: -100
+    wrapU: 1
+    wrapV: 1
+    wrapW: -1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  applyGammaDecoding: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Resources/Images/点亮中国/灯笼按钮图标.png.meta

@@ -0,0 +1,128 @@
+fileFormatVersion: 2
+guid: 05824c0652fb7f045a89cde15cadaf42
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 11
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: -1
+    aniso: 1
+    mipBias: -100
+    wrapU: 1
+    wrapV: 1
+    wrapW: -1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  applyGammaDecoding: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Resources/UI/Prefab/Panel/Mobile/ActivityAdPanel.prefab

@@ -0,0 +1,826 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &211157559672625
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 4531898786540065546}
+  - component: {fileID: 8590622536973729807}
+  - component: {fileID: 3601067056924617886}
+  - component: {fileID: 1924271529105522720}
+  m_Layer: 5
+  m_Name: p1
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &4531898786540065546
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 211157559672625}
+  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: 2050749757860681065}
+  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_AnchoredPosition: {x: 0, y: -79}
+  m_SizeDelta: {x: 93, y: 16}
+  m_Pivot: {x: 0.5, y: 1}
+--- !u!222 &8590622536973729807
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 211157559672625}
+  m_CullTransparentMesh: 0
+--- !u!114 &3601067056924617886
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 211157559672625}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0.9960785, g: 0.8235295, b: 0.5803922, a: 1}
+  m_RaycastTarget: 1
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_FontData:
+    m_Font: {fileID: 12800000, guid: 9428f2aab98e9c34d923a9174035a197, type: 3}
+    m_FontSize: 14
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 10
+    m_MaxSize: 40
+    m_Alignment: 4
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: "\u8FD0\u52A8\u5730\u74032022"
+--- !u!114 &1924271529105522720
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 211157559672625}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: cfabb0440166ab443bba8876756fdfa9, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_EffectColor: {r: 0.7254902, g: 0.08627451, b: 0, a: 1}
+  m_EffectDistance: {x: 0, y: -2}
+  m_UseGraphicAlpha: 1
+--- !u!1 &224189119525401108
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 6473701544485149591}
+  - component: {fileID: 920253990769665214}
+  - component: {fileID: 2228009803149392053}
+  - component: {fileID: 3430964368945265011}
+  m_Layer: 5
+  m_Name: BtnRule
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &6473701544485149591
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 224189119525401108}
+  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: 2050749757860681065}
+  m_RootOrder: 3
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 1}
+  m_AnchorMax: {x: 0.5, y: 1}
+  m_AnchoredPosition: {x: 0, y: -137}
+  m_SizeDelta: {x: 59, y: 14}
+  m_Pivot: {x: 0.5, y: 1}
+--- !u!222 &920253990769665214
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 224189119525401108}
+  m_CullTransparentMesh: 0
+--- !u!114 &2228009803149392053
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 224189119525401108}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_FontData:
+    m_Font: {fileID: 12800000, guid: 9428f2aab98e9c34d923a9174035a197, type: 3}
+    m_FontSize: 12
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 1
+    m_MaxSize: 40
+    m_Alignment: 4
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: "\u67E5\u770B\u89C4\u5219 >"
+--- !u!114 &3430964368945265011
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 224189119525401108}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: cfabb0440166ab443bba8876756fdfa9, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_EffectColor: {r: 0.7254902, g: 0.08627451, b: 0, a: 1}
+  m_EffectDistance: {x: 0, y: -2}
+  m_UseGraphicAlpha: 1
+--- !u!1 &525523088794526912
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 525523088794526915}
+  - component: {fileID: 525523088794526917}
+  - component: {fileID: 525523088794526914}
+  m_Layer: 5
+  m_Name: Btn
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &525523088794526915
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 525523088794526912}
+  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:
+  - {fileID: 1618687164648976187}
+  - {fileID: 4449723645784208509}
+  m_Father: {fileID: 2050749757860681065}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0}
+  m_AnchorMax: {x: 0.5, y: 0}
+  m_AnchoredPosition: {x: 0, y: 78}
+  m_SizeDelta: {x: 130, y: 41}
+  m_Pivot: {x: 0.5, y: 0}
+--- !u!222 &525523088794526917
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 525523088794526912}
+  m_CullTransparentMesh: 0
+--- !u!114 &525523088794526914
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 525523088794526912}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 21300000, guid: 09d9c1abb2bfef544b4327484ce583aa, type: 3}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+--- !u!1 &525523089472465305
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 525523089472465304}
+  - component: {fileID: 525523089472465306}
+  - component: {fileID: 525523089472465307}
+  m_Layer: 5
+  m_Name: Exit
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &525523089472465304
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 525523089472465305}
+  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: 525523089819956055}
+  m_RootOrder: 2
+  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_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &525523089472465306
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 525523089472465305}
+  m_CullTransparentMesh: 0
+--- !u!114 &525523089472465307
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 525523089472465305}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 21300000, guid: d1b6b675814203941b27cd80999b11cf, type: 3}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+--- !u!1 &525523089819956052
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 525523089819956055}
+  - component: {fileID: 525523089819956009}
+  - component: {fileID: 525523089819956054}
+  - component: {fileID: 5551100626125524786}
+  m_Layer: 5
+  m_Name: ActivityAdPanel
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &525523089819956055
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 525523089819956052}
+  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:
+  - {fileID: 2090836201531894202}
+  - {fileID: 2050749757860681065}
+  - {fileID: 525523089472465304}
+  m_Father: {fileID: 0}
+  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 &525523089819956009
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 525523089819956052}
+  m_CullTransparentMesh: 0
+--- !u!114 &525523089819956054
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 525523089819956052}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0.13725491, g: 0.13725491, b: 0.1764706, a: 0.8}
+  m_RaycastTarget: 1
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 0}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+--- !u!114 &5551100626125524786
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 525523089819956052}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 7b1e8b738244e0c479ad2a05dd24d3e5, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  newNav: {fileID: 0}
+--- !u!1 &949113626255950055
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 8531341998025236401}
+  - component: {fileID: 8339931184435968657}
+  - component: {fileID: 7991832234422971560}
+  - component: {fileID: 427877783134585870}
+  m_Layer: 5
+  m_Name: p2
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &8531341998025236401
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 949113626255950055}
+  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: 2050749757860681065}
+  m_RootOrder: 2
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 1}
+  m_AnchorMax: {x: 0.5, y: 1}
+  m_AnchoredPosition: {x: 0, y: -96}
+  m_SizeDelta: {x: 136, y: 40}
+  m_Pivot: {x: 0.5, y: 1}
+--- !u!222 &8339931184435968657
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 949113626255950055}
+  m_CullTransparentMesh: 0
+--- !u!114 &7991832234422971560
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 949113626255950055}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_FontData:
+    m_Font: {fileID: 12800000, guid: 9428f2aab98e9c34d923a9174035a197, type: 3}
+    m_FontSize: 34
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 3
+    m_MaxSize: 40
+    m_Alignment: 4
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: "\u70B9\u4EAE\u4E2D\u56FD"
+--- !u!114 &427877783134585870
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 949113626255950055}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: cfabb0440166ab443bba8876756fdfa9, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_EffectColor: {r: 0.7254902, g: 0.08627451, b: 0, a: 1}
+  m_EffectDistance: {x: 0, y: -2}
+  m_UseGraphicAlpha: 1
+--- !u!1 &1054223613381695621
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 2050749757860681065}
+  - component: {fileID: 2085848023626952018}
+  - component: {fileID: 8988688016560977493}
+  m_Layer: 5
+  m_Name: LightUpChina
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!224 &2050749757860681065
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1054223613381695621}
+  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:
+  - {fileID: 525523088794526915}
+  - {fileID: 4531898786540065546}
+  - {fileID: 8531341998025236401}
+  - {fileID: 6473701544485149591}
+  m_Father: {fileID: 525523089819956055}
+  m_RootOrder: 1
+  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: 0, y: 0}
+  m_SizeDelta: {x: 365, y: 365}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &2085848023626952018
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1054223613381695621}
+  m_CullTransparentMesh: 0
+--- !u!114 &8988688016560977493
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1054223613381695621}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 21300000, guid: eec60a5beae78fa4ea9d0db5cdf39d06, type: 3}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+--- !u!1 &3060475963390715533
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1618687164648976187}
+  - component: {fileID: 469202728442285366}
+  - component: {fileID: 7492973097224192934}
+  m_Layer: 5
+  m_Name: Text
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &1618687164648976187
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3060475963390715533}
+  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: 525523088794526915}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0.5}
+  m_AnchorMax: {x: 0, y: 0.5}
+  m_AnchoredPosition: {x: 58, y: -1}
+  m_SizeDelta: {x: 56, y: 18}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &469202728442285366
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3060475963390715533}
+  m_CullTransparentMesh: 0
+--- !u!114 &7492973097224192934
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3060475963390715533}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_FontData:
+    m_Font: {fileID: 12800000, guid: 9428f2aab98e9c34d923a9174035a197, type: 3}
+    m_FontSize: 14
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 10
+    m_MaxSize: 40
+    m_Alignment: 4
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: "\u9A6C\u4E0A\u53C2\u52A0"
+--- !u!1 &3385961605716274462
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 2090836201531894202}
+  - component: {fileID: 6322400348156303082}
+  - component: {fileID: 4877973275652039468}
+  m_Layer: 5
+  m_Name: Image
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &2090836201531894202
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3385961605716274462}
+  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: 525523089819956055}
+  m_RootOrder: 0
+  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: 0, y: 0}
+  m_SizeDelta: {x: 365, y: 365}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &6322400348156303082
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3385961605716274462}
+  m_CullTransparentMesh: 0
+--- !u!114 &4877973275652039468
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3385961605716274462}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 1344c3c82d62a2a41a3576d8abb8e3ea, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 0}
+  m_RaycastTarget: 1
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Texture: {fileID: 0}
+  m_UVRect:
+    serializedVersion: 2
+    x: 0
+    y: 0
+    width: 1
+    height: 1
+--- !u!1 &6816544219278866307
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 4449723645784208509}
+  - component: {fileID: 1208936942111988682}
+  - component: {fileID: 7482634211180008688}
+  m_Layer: 5
+  m_Name: Image
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &4449723645784208509
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6816544219278866307}
+  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: 525523088794526915}
+  m_RootOrder: 1
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0.5}
+  m_AnchorMax: {x: 0, y: 0.5}
+  m_AnchoredPosition: {x: 93, y: 0}
+  m_SizeDelta: {x: 6, y: 8.571428}
+  m_Pivot: {x: 0, y: 0.5}
+--- !u!222 &1208936942111988682
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6816544219278866307}
+  m_CullTransparentMesh: 0
+--- !u!114 &7482634211180008688
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6816544219278866307}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 21300000, guid: 05824c0652fb7f045a89cde15cadaf42, type: 3}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1

Assets/Resources/UI/Prefab/Panel/Mobile/ActivityAdPanel.prefab.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 7cd91ac3c0b6402499516b71b4e2d928
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Resources/UI/Prefab/Panel/Mobile/ActivityPanel.prefab

@@ -0,0 +1,160 @@
+%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
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 8017954799840778711}
+  - component: {fileID: 8017954799840778729}
+  - component: {fileID: 8017954799840778710}
+  - component: {fileID: 7335676457698302787}
+  m_Layer: 5
+  m_Name: ActivityPanel
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &8017954799840778711
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8017954799840778708}
+  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:
+  - {fileID: 8017954798751087356}
+  m_Father: {fileID: 0}
+  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 &8017954799840778729
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8017954799840778708}
+  m_CullTransparentMesh: 0
+--- !u!114 &8017954799840778710
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8017954799840778708}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0.13725491, g: 0.13725491, b: 0.1764706, a: 1}
+  m_RaycastTarget: 1
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 0}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+--- !u!114 &7335676457698302787
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8017954799840778708}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: f1555c37779867f4c8f57a837cfe01c7, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  newNav: {fileID: 0}

Assets/Resources/UI/Prefab/Panel/Mobile/ActivityPanel.prefab.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 3db187cd57c705341b45de7a3423f4ed
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Resources/UI/Prefab/Panel/Mobile/AddressPanel.prefab.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: c7f98e650a0e7bb4aa09df40c9994600
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Resources/UI/language.json

@@ -316,7 +316,8 @@
     "Current ride distance too short to save.": "当前骑行距离过短无法保存",
     "NO RIDERS": "暂无用户",
     "Current Version:": "当前版本：",
-    "Latest Version:": "最新版本："
+    "Latest Version:": "最新版本：",
+    "Confirm participation": "确认参加活动"
   },
   "en": {
     "HOT ROUTES": "HOT ROUTES",
@@ -627,6 +628,7 @@
     "Current ride distance too short to save.": "Current ride distance too short to save.",
     "NO RIDERS": "NO RIDERS",
     "Current Version:": "Current Version:",
-    "Latest Version:": "Latest Version:"
+    "Latest Version:": "Latest Version:",
+    "Confirm participation": "Confirm participation"
   }
 }

Assets/Scenes/Test2.unity

@@ -121,13 +121,7 @@ NavMeshSettings:
     debug:
       m_Flags: 0
   m_NavMeshData: {fileID: 0}
---- !u!224 &467445919 stripped
-RectTransform:
-  m_CorrespondingSourceObject: {fileID: 245658337100488343, guid: cb6e4df8333395042a0b47930ac1b5d9,
-    type: 3}
-  m_PrefabInstance: {fileID: 245658336666613256}
-  m_PrefabAsset: {fileID: 0}
---- !u!21 &535438819
+--- !u!21 &644484976
 Material:
   serializedVersion: 6
   m_ObjectHideFlags: 0
@@ -212,7 +206,7 @@ Material:
     m_Colors:
     - _Color: {r: 1, g: 1, b: 1, a: 1}
     - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
-    - _WidthHeightRadius: {r: 354, g: 370, b: 40, a: 0}
+    - _WidthHeightRadius: {r: 424, g: 284, b: 40, a: 0}
 --- !u!1 &845512357
 GameObject:
   m_ObjectHideFlags: 0
@@ -474,6 +468,12 @@ Transform:
   m_Father: {fileID: 0}
   m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!224 &1371005267 stripped
+RectTransform:
+  m_CorrespondingSourceObject: {fileID: 3259611886777947215, guid: c7f98e650a0e7bb4aa09df40c9994600,
+    type: 3}
+  m_PrefabInstance: {fileID: 3259611888115103004}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1 &1678571397
 GameObject:
   m_ObjectHideFlags: 0
@@ -565,7 +565,7 @@ RectTransform:
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 0, y: 0, z: 0}
   m_Children:
-  - {fileID: 467445919}
+  - {fileID: 1371005267}
   m_Father: {fileID: 0}
   m_RootOrder: 3
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -665,137 +665,147 @@ Transform:
   m_Father: {fileID: 0}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 48.593002, y: -4.8190002, z: -6.4140005}
---- !u!1001 &245658336666613256
+--- !u!1001 &3259611888115103004
 PrefabInstance:
   m_ObjectHideFlags: 0
   serializedVersion: 2
   m_Modification:
     m_TransformParent: {fileID: 1678571401}
     m_Modifications:
-    - target: {fileID: 245658336711370113, guid: cb6e4df8333395042a0b47930ac1b5d9,
-        type: 3}
-      propertyPath: m_Material
-      value: 
-      objectReference: {fileID: 535438819}
-    - target: {fileID: 245658337100488342, guid: cb6e4df8333395042a0b47930ac1b5d9,
-        type: 3}
-      propertyPath: m_Name
-      value: AppleInfoModal
-      objectReference: {fileID: 0}
-    - target: {fileID: 245658337100488343, guid: cb6e4df8333395042a0b47930ac1b5d9,
-        type: 3}
-      propertyPath: m_Pivot.x
-      value: 0.5
-      objectReference: {fileID: 0}
-    - target: {fileID: 245658337100488343, guid: cb6e4df8333395042a0b47930ac1b5d9,
-        type: 3}
-      propertyPath: m_Pivot.y
-      value: 0.5
-      objectReference: {fileID: 0}
-    - target: {fileID: 245658337100488343, guid: cb6e4df8333395042a0b47930ac1b5d9,
-        type: 3}
-      propertyPath: m_RootOrder
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 245658337100488343, guid: cb6e4df8333395042a0b47930ac1b5d9,
-        type: 3}
-      propertyPath: m_AnchorMax.x
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 245658337100488343, guid: cb6e4df8333395042a0b47930ac1b5d9,
-        type: 3}
-      propertyPath: m_AnchorMax.y
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 245658337100488343, guid: cb6e4df8333395042a0b47930ac1b5d9,
-        type: 3}
-      propertyPath: m_AnchorMin.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 245658337100488343, guid: cb6e4df8333395042a0b47930ac1b5d9,
-        type: 3}
-      propertyPath: m_AnchorMin.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 245658337100488343, guid: cb6e4df8333395042a0b47930ac1b5d9,
+    - target: {fileID: 3075689270401806883, guid: c7f98e650a0e7bb4aa09df40c9994600,
         type: 3}
       propertyPath: m_SizeDelta.x
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 245658337100488343, guid: cb6e4df8333395042a0b47930ac1b5d9,
+    - target: {fileID: 3259611886777947214, guid: c7f98e650a0e7bb4aa09df40c9994600,
+        type: 3}
+      propertyPath: m_Name
+      value: AddressPanel
+      objectReference: {fileID: 0}
+    - target: {fileID: 3259611886777947215, guid: c7f98e650a0e7bb4aa09df40c9994600,
+        type: 3}
+      propertyPath: m_Pivot.x
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 3259611886777947215, guid: c7f98e650a0e7bb4aa09df40c9994600,
+        type: 3}
+      propertyPath: m_Pivot.y
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 3259611886777947215, guid: c7f98e650a0e7bb4aa09df40c9994600,
+        type: 3}
+      propertyPath: m_RootOrder
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3259611886777947215, guid: c7f98e650a0e7bb4aa09df40c9994600,
+        type: 3}
+      propertyPath: m_AnchorMax.x
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 3259611886777947215, guid: c7f98e650a0e7bb4aa09df40c9994600,
+        type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 3259611886777947215, guid: c7f98e650a0e7bb4aa09df40c9994600,
+        type: 3}
+      propertyPath: m_AnchorMin.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3259611886777947215, guid: c7f98e650a0e7bb4aa09df40c9994600,
+        type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3259611886777947215, guid: c7f98e650a0e7bb4aa09df40c9994600,
+        type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3259611886777947215, guid: c7f98e650a0e7bb4aa09df40c9994600,
         type: 3}
       propertyPath: m_SizeDelta.y
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 245658337100488343, guid: cb6e4df8333395042a0b47930ac1b5d9,
+    - target: {fileID: 3259611886777947215, guid: c7f98e650a0e7bb4aa09df40c9994600,
         type: 3}
       propertyPath: m_LocalPosition.x
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 245658337100488343, guid: cb6e4df8333395042a0b47930ac1b5d9,
+    - target: {fileID: 3259611886777947215, guid: c7f98e650a0e7bb4aa09df40c9994600,
         type: 3}
       propertyPath: m_LocalPosition.y
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 245658337100488343, guid: cb6e4df8333395042a0b47930ac1b5d9,
+    - target: {fileID: 3259611886777947215, guid: c7f98e650a0e7bb4aa09df40c9994600,
         type: 3}
       propertyPath: m_LocalPosition.z
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 245658337100488343, guid: cb6e4df8333395042a0b47930ac1b5d9,
+    - target: {fileID: 3259611886777947215, guid: c7f98e650a0e7bb4aa09df40c9994600,
         type: 3}
       propertyPath: m_LocalRotation.w
       value: 1
       objectReference: {fileID: 0}
-    - target: {fileID: 245658337100488343, guid: cb6e4df8333395042a0b47930ac1b5d9,
+    - target: {fileID: 3259611886777947215, guid: c7f98e650a0e7bb4aa09df40c9994600,
         type: 3}
       propertyPath: m_LocalRotation.x
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 245658337100488343, guid: cb6e4df8333395042a0b47930ac1b5d9,
+    - target: {fileID: 3259611886777947215, guid: c7f98e650a0e7bb4aa09df40c9994600,
         type: 3}
       propertyPath: m_LocalRotation.y
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 245658337100488343, guid: cb6e4df8333395042a0b47930ac1b5d9,
+    - target: {fileID: 3259611886777947215, guid: c7f98e650a0e7bb4aa09df40c9994600,
         type: 3}
       propertyPath: m_LocalRotation.z
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 245658337100488343, guid: cb6e4df8333395042a0b47930ac1b5d9,
+    - target: {fileID: 3259611886777947215, guid: c7f98e650a0e7bb4aa09df40c9994600,
         type: 3}
       propertyPath: m_AnchoredPosition.x
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 245658337100488343, guid: cb6e4df8333395042a0b47930ac1b5d9,
+    - target: {fileID: 3259611886777947215, guid: c7f98e650a0e7bb4aa09df40c9994600,
         type: 3}
       propertyPath: m_AnchoredPosition.y
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 245658337100488343, guid: cb6e4df8333395042a0b47930ac1b5d9,
+    - target: {fileID: 3259611886777947215, guid: c7f98e650a0e7bb4aa09df40c9994600,
         type: 3}
       propertyPath: m_LocalEulerAnglesHint.x
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 245658337100488343, guid: cb6e4df8333395042a0b47930ac1b5d9,
+    - target: {fileID: 3259611886777947215, guid: c7f98e650a0e7bb4aa09df40c9994600,
         type: 3}
       propertyPath: m_LocalEulerAnglesHint.y
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 245658337100488343, guid: cb6e4df8333395042a0b47930ac1b5d9,
+    - target: {fileID: 3259611886777947215, guid: c7f98e650a0e7bb4aa09df40c9994600,
         type: 3}
       propertyPath: m_LocalEulerAnglesHint.z
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 5376657005773271520, guid: cb6e4df8333395042a0b47930ac1b5d9,
+    - target: {fileID: 3259611887808822897, guid: c7f98e650a0e7bb4aa09df40c9994600,
         type: 3}
-      propertyPath: m_AnchoredPosition.x
+      propertyPath: m_Material
+      value: 
+      objectReference: {fileID: 644484976}
+    - target: {fileID: 7262351569372150555, guid: c7f98e650a0e7bb4aa09df40c9994600,
+        type: 3}
+      propertyPath: m_AnchorMax.y
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 5376657006350838078, guid: cb6e4df8333395042a0b47930ac1b5d9,
+    - target: {fileID: 7262351569372150555, guid: c7f98e650a0e7bb4aa09df40c9994600,
+        type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7262351569372150555, guid: c7f98e650a0e7bb4aa09df40c9994600,
         type: 3}
       propertyPath: m_AnchoredPosition.x
       value: 0
       objectReference: {fileID: 0}
     m_RemovedComponents: []
-  m_SourcePrefab: {fileID: 100100000, guid: cb6e4df8333395042a0b47930ac1b5d9, type: 3}
+  m_SourcePrefab: {fileID: 100100000, guid: c7f98e650a0e7bb4aa09df40c9994600, type: 3}

Assets/Scripts/Apis/ActivityApi.cs

@@ -0,0 +1,33 @@
+using Assets.Scripts.Apis.Models;
+using Newtonsoft.Json;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using UnityEngine;
+
+namespace Assets.Scripts.Apis
+{
+    public class ActivityApi : ApiBase
+    {
+        public async Task<JsonResult<List<ActivityModel>>> GetCurrentActivityList()
+        {
+            var result = await GetAsync<JsonResult<List<ActivityModel>>>($"MapRouteActivityRecord/GetCurrentActivityList");
+            return result;
+        }
+
+        public async Task<JsonResult<object>> JoinActivity(int id)
+        {
+            var result = await PostAsync<JsonResult<object>>($"MapRouteActivityRecord/Add", new { activityId = id });
+            return result;
+        }
+
+        public async Task<JsonResult<object>> GetMapRouteRecordById(int id, int activityId)
+        {
+            var result = await GetAsync<JsonResult<object>>($"MapRouteActivityRecord/GetMapRouteRecordById");
+            return result;
+        }
+        //
+    }
+}

Assets/Scripts/Apis/ActivityApi.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 87a02f5a9d8ce2e43b46b9bbbc2a04c4
+guid: 43b1d699511a9e340a85aac88a8bbd0c
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

Assets/Scripts/Apis/Models/ActivityModel.cs

@@ -0,0 +1,61 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Assets.Scripts.Apis.Models
+{
+    public class ActivityModel
+    {
+        /// <summary>
+        /// 
+        /// </summary>
+        public int Id { get; set; }
+        /// <summary>
+        /// 
+        /// </summary>
+        public string BannerUrl { get; set; }
+        /// <summary>
+        /// 
+        /// </summary>
+        public string DetailUrl { get; set; }
+        /// <summary>
+        /// 点亮中国
+        /// </summary>
+        public string Content { get; set; }
+        /// <summary>
+        /// 
+        /// </summary>
+        public string CreateTime { get; set; }
+        /// <summary>
+        /// 
+        /// </summary>
+        public string EndTime { get; set; }
+        /// <summary>
+        /// 
+        /// </summary>
+        public string IsDelete { get; set; }
+        /// <summary>
+        /// 
+        /// </summary>
+        public string IsPublic { get; set; }
+        /// <summary>
+        /// 点亮中国
+        /// </summary>
+        public string Title { get; set; }
+        /// <summary>
+        /// 点亮中国
+        /// </summary>
+        public string Strategy { get; set; }
+        /// <summary>
+        /// 
+        /// </summary>
+        public string JsonConfig { get; set; }
+        /// <summary>
+        /// 
+        /// </summary>
+        public double TotalTicks { get; set; }
+        public string Url { get; set; }
+    }
+}

Assets/Scripts/Apis/Models/ActivityModel.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 688cf851c22dcdd4b83924371a8f9c85
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scripts/Apis/Models/Recommand.cs

@@ -28,5 +28,6 @@ namespace Assets.Scripts.Apis.Models
         /// 活动链接
         /// </summary>
         public string Url { get; set; }
+        public int? ActivityId { get; set; }
     }
 }

Assets/Scripts/App.cs

@@ -20,12 +20,13 @@ public delegate void ChangeLanguageDelegate();
 
 public static class App
 {
-    public static string Host = "http://192.168.0.102:5082/";
+    public static string Host = "http://192.168.0.101:5085/";
 
     public static string AppVersion = Application.version;
 
     public static int RouteIdParam = 0;
     public static UserResultModel CurrentUser { get; set; }
+    public static string ActivityUrl { get; internal set; }
 #if !(UNITY_ANDROID || UNITY_IOS)
     //pc版微信id
     public static string WxAppId => "wx9e8ca734e024f084";
@@ -65,6 +66,8 @@ public static class App
     public static string notifyContent { get; internal set; }
     //全局用，如果弹多条消息用这个队列
     public static Queue<string> multiNotifyContent;
+    //全局用，弹多个广告
+    public static Queue<ActivityModel> adQueue;
 
     public static RideSetting RideSetting = new RideSetting();
     public static string pageName { get; set; }
@@ -187,6 +190,9 @@ public static class App
             }
         }
     }
+
+    public static bool CanOpenAd = false;
+
     public static Dictionary<string, string> websiteDict = new Dictionary<string, string>()
     {
         {"https://wx.powerfun.com.cn/","http://www.powerfun.com/" },
@@ -201,13 +207,13 @@ public static class App
       //UdpAddress = new IPEndPoint(IPAddress.Parse("47.97.84.8"), 21000);
       //TcpAddress = new IPEndPoint(IPAddress.Parse("47.97.84.8"), 21001);
       //线上
-        Host = "https://wx.powerfun.com.cn/";
-        UdpAddress = new IPEndPoint(IPAddress.Parse("47.97.84.8"), 11000);
-        TcpAddress = new IPEndPoint(IPAddress.Parse("47.97.84.8"), 11001);
+        //Host = "https://wx.powerfun.com.cn/";
+        //UdpAddress = new IPEndPoint(IPAddress.Parse("47.97.84.8"), 11000);
+        //TcpAddress = new IPEndPoint(IPAddress.Parse("47.97.84.8"), 11001);
         //本地
-        //Host = "http://192.168.0.101:5085/";
-        //UdpAddress = new IPEndPoint(IPAddress.Parse("192.168.0.97"), 11000);
-        //TcpAddress = new IPEndPoint(IPAddress.Parse("192.168.0.102"), 21001);
+        Host = "http://192.168.0.101:5085/";
+        UdpAddress = new IPEndPoint(IPAddress.Parse("192.168.0.97"), 11000);
+        TcpAddress = new IPEndPoint(IPAddress.Parse("192.168.0.102"), 21001);
         Debug.unityLogger.logEnabled = false;
 #else 
         //Host = "http://pf.juze.pro/";
@@ -233,6 +239,7 @@ public static class App
         //App.ChangeLanguage("en");
         globalMessageQueue = new Queue<LinkedMessageEvent>();
         multiNotifyContent = new Queue<string>();
+        adQueue = new Queue<ActivityModel>();
         Screen.sleepTimeout = SleepTimeout.NeverSleep;
     }
 }

Assets/Scripts/ConfigHelper.cs

@@ -23,6 +23,15 @@ namespace Assets.Scripts
                 return _userApi;
             }
         }
+        private static ActivityApi _activityApi;
+        public static ActivityApi activityApi
+        {
+            get
+            {
+                if (_activityApi == null) _activityApi = new ActivityApi();
+                return _activityApi;
+            }
+        }
         private static MapApi _mapApi;
         public static MapApi mapApi
         {

Assets/Scripts/Scenes/LoginController.cs

@@ -117,6 +117,10 @@ public class LoginController : BaseScene
 
     public Texture avatar;
     // Start is called before the first frame update
+    private void Awake()
+    {
+        App.CanOpenAd = true;
+    }
     void Start()
     {
 #if UNITY_ANDROID || UNITY_IOS

Assets/Scripts/Scenes/MainController.cs

@@ -337,6 +337,24 @@ public class MainController : BaseScene
         else
         {
             UIManager.ShowHomePanel();
+            if (App.CanOpenAd) 
+            {
+                App.CanOpenAd = false;
+
+                var _r = await ConfigHelper.activityApi.GetCurrentActivityList();
+                if (_r.result && _r.data != null)
+                {
+                    var adList = _r.data;
+                    App.adQueue.Clear();
+                    foreach (var _ad in adList)
+                    {
+                        App.adQueue.Enqueue(_ad);
+                    }
+                    var ad = App.adQueue.Dequeue();
+                    UIManager.ShowActivityAdPanel(ad.Id, ad.DetailUrl, ad.Url + $"?Token={App.CurrentUser.cookie}");
+                }
+            }
+            
             //UIManager.ShowNewRouteOverviewPanel();
             //UIManager.ShowUserInfoPanel();
             //UIManager.ShowEditUserPanel();

Assets/Scripts/UI/Prefab/Activity.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 81ba7cd19f440d4418b28812b34dbe86
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scripts/UI/Prefab/Activity/ActivityAdController.cs

@@ -0,0 +1,71 @@
+using Assets.Scripts;
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEngine.UI;
+
+public class ActivityAdController : PFUIPanel
+{
+    Dictionary<string, Texture> caches;
+    protected override void Awake()
+    {
+        caches = new Dictionary<string, Texture>();
+        UIManager.AddEvent(transform.Find("Exit").gameObject, UnityEngine.EventSystems.EventTriggerType.PointerClick, b =>
+         {
+             Close();
+             if (App.adQueue.Count > 0) 
+             {
+                 Invoke("ShowSelf", 0.5f);
+             }
+         });
+        UIManager.AddEvent(transform.Find("Image").gameObject, UnityEngine.EventSystems.EventTriggerType.PointerClick, async b =>
+        {
+            Close();
+            //可以传参
+            //UIManager.ShowActivityPanel(url);
+            await ConfigHelper.activityApi.JoinActivity(id);
+            if (string.IsNullOrEmpty(App.CurrentUser.Contact) || string.IsNullOrEmpty(App.CurrentUser.ContactPhone) || string.IsNullOrEmpty(App.CurrentUser.ContactAddress)) 
+            {
+                UIManager.ShowAddressPanel();
+            }
+            else 
+            {
+                UIManager.ShowActivityPanel(url);
+            }
+            
+        });
+        //UIManager.AddEvent(transform.Find("LightUpChina/BtnRule").gameObject, UnityEngine.EventSystems.EventTriggerType.PointerClick, b =>
+        //{
+        //    Application.OpenURL("https://www.baidu.com/");
+        //});
+
+    }
+    private void ShowSelf() 
+    {
+        var ad = App.adQueue.Dequeue();
+        UIManager.ShowActivityAdPanel(ad.Id, ad.DetailUrl, ad.Url + $"?Token={App.CurrentUser.cookie}");
+    }
+    string image = null, url = null;
+    int id = 0;
+    public void Initial(int id, string image, string url) 
+    {
+        this.id = id;
+        this.image = image;
+        var ri = transform.Find("Image").GetComponent<RawImage>();
+        Utils.DisplayImageTempDict(ri, image, caches);
+        App.ActivityUrl = url;
+        this.url = url;
+    }
+    // Update is called once per frame
+    void Update()
+    {
+        
+    }
+    protected override void OnDestroy()
+    {
+        caches = null;
+        Resources.UnloadUnusedAssets();
+        GC.Collect();
+    }
+}

Assets/Scripts/UI/Prefab/Activity/ActivityAdController.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 7b1e8b738244e0c479ad2a05dd24d3e5
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scripts/UI/Prefab/Activity/ActivityController.cs

@@ -0,0 +1,125 @@
+using Assets.Scripts;
+using Assets.Scripts.Apis.Models;
+using Newtonsoft.Json;
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEngine.SceneManagement;
+
+public class ActivityController : PFUIPanel
+{
+    Transform browser;
+    UniWebView webView;
+    protected override void Awake()
+    {
+        browser = transform.Find("Browser");
+        webView = browser.GetComponent<UniWebView>();
+        //webView.Show();
+    }
+
+    public override void Show()
+    {
+        base.Show();
+        //Debug.Log(20);
+        //Invoke("StartPageFunc",0.5f);
+    }
+
+    private void StartPageFunc()
+    {
+        Debug.Log("开始");
+        // Load a URL.
+
+        webView.Frame = new Rect(0, 0, Screen.width, Screen.height);
+        webView.ReferenceRectTransform = browser.GetComponent<RectTransform>();
+        webView.SetUserAgent($"UniWebView {Application.platform} {Application.version}");
+        webView.BackgroundColor = Utils.HexToColorHtml("#23232d");
+        webView.Load(url);
+        // Show it.
+        webView.Show();
+        webView.OnMessageReceived -= FromJs;
+        webView.OnMessageReceived += FromJs;
+    }
+    private void FromJs(UniWebView webView, UniWebViewMessage message)
+    {
+        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;
+            default:break;
+        }
+        //if (message.Path.Equals("Close"))
+        //{
+        //    Debug.Log(message.Args["msg"]);
+        //    //transform.Find("Text").GetComponent<Text>().text = message.Args["msg"];
+        //}
+    }
+
+    private void OpenUrl(Dictionary<string, string> args)
+    {
+        Application.OpenURL(System.Net.WebUtility.UrlDecode(args["url"]));
+    }
+
+    private void Share(Dictionary<string, string> args)
+    {
+        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)
+        {
+            if (App.weChatController.IsWeChatAppInstalled())
+            {
+                App.weChatController.ShareWebpageToWX(type, url, "点亮中国活动", "by " + App.CurrentUser.Nickname, null);
+            }
+        }
+        else 
+        {
+            UnityEngine.GUIUtility.systemCopyBuffer = url;
+            browser.GetComponent<UniWebView>().EvaluateJavaScript("window.postMessage(\"webview;复制成功\")");
+        }
+    }
+
+    private void StartRide(Dictionary<string, string> args)
+    {
+        var id = int.Parse(args["id"]);
+        App.RouteIdParam = id;
+        if (args.ContainsKey("routeResult")) 
+        {
+            Debug.Log(args.ContainsKey("routeResult"));
+            App.routeResult = JsonConvert.DeserializeObject<RouteResult>(args["routeResult"]);
+        }
+        SceneManager.LoadScene("Ride");
+    }
+
+    private void CloseFunc() 
+    {
+        CancelInvoke("StartPageFunc");
+        Close();
+    }
+    // Update is called once per frame
+    void Update()
+    {
+        
+    }
+    string url { get; set; }
+
+    public void Initial(string url)
+    {
+        this.url = url;
+        Debug.Log(this.url);
+        StartPageFunc();
+        return;
+        if (this.url != url)
+        {
+            this.url = url;
+            StartPageFunc();
+        }
+        else 
+        {
+            //执行浏览器内刷新或者其他操作
+        }
+    }
+}

Assets/Scripts/UI/Prefab/Activity/ActivityController.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: f1555c37779867f4c8f57a837cfe01c7
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scripts/UI/Prefab/Activity/AddressController.cs

@@ -0,0 +1,49 @@
+using Assets.Scripts;
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEngine.UI;
+
+public class AddressController : PFUIPanel
+{
+    // Start is called before the first frame update
+    Dictionary<string, InputField> inputDict;
+    protected override void Awake()
+    {
+        inputDict = new Dictionary<string, InputField>() 
+        {
+            {"Name",transform.Find("Main/Name/input").GetComponent<InputField>() },
+            {"Phone",transform.Find("Main/PN/input").GetComponent<InputField>() },
+            {"Address",transform.Find("Main/Addr/input").GetComponent<InputField>() },
+        };
+        inputDict["Name"].text = App.CurrentUser.Contact;
+        inputDict["Phone"].text = App.CurrentUser.ContactPhone;
+        inputDict["Address"].text = App.CurrentUser.ContactAddress;
+        UIManager.AddEvent(transform.Find("Main/BtnJoin").gameObject, UnityEngine.EventSystems.EventTriggerType.PointerClick, async b =>
+         {
+             App.CurrentUser.Contact = inputDict["Name"].text;
+             App.CurrentUser.ContactPhone = inputDict["Phone"].text;
+             App.CurrentUser.ContactAddress = inputDict["Address"].text;
+             var res = await ConfigHelper.userApi.UpdateUserInfo(App.CurrentUser);
+             if (res.result) 
+             {
+                 Close();
+                 UIManager.ShowActivityPanel(App.ActivityUrl);
+             }
+         });
+        UIManager.AddEvent(transform.Find("Main/Exit").gameObject, UnityEngine.EventSystems.EventTriggerType.PointerClick, b =>
+        {
+            Close();
+        });
+    }
+    void Start()
+    {
+        
+    }
+
+    // Update is called once per frame
+    void Update()
+    {
+        
+    }
+}

Assets/Scripts/UI/Prefab/Activity/AddressController.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 6337a1358d5d95f4293c650d8486815d
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scripts/UI/Prefab/Panel/UserInfoController.cs

@@ -16,6 +16,7 @@ public class UserInfoController : PFUIPanel
     {
         this.transform.localPosition = new Vector3(0, 0, 0);
         Button exitBtn = this.transform.Find("InfoPanel").Find("Button").GetComponent<Button>();
+#if UNITY_ANDROID || UNITY_IOS
         UIManager.AddEvent(transform.Find("InfoButton").gameObject, EventTriggerType.PointerClick, b =>
         {
             UIManager.ShowAppleInfoModal(() =>
@@ -23,6 +24,7 @@ public class UserInfoController : PFUIPanel
                 Load();
             });
         });
+#endif
         UIManager.AddEvent(exitBtn.gameObject, EventTriggerType.PointerClick, (b) =>
         {
             UIManager.ShowPrePanel();
@@ -105,9 +107,12 @@ public class UserInfoController : PFUIPanel
             var summary = r.data;
             var user = App.CurrentUser;
             Debug.Log(user.CanCreateRace);
+            if(infoPanel == null) infoPanel = transform.Find("InfoPanel").Find("P");
+            if(summaryPanel == null) summaryPanel = transform.Find("SummaryPanel");
             Utils.DisplayHead(infoPanel.Find("Avatar").GetComponent<RawImage>(), user.WxHeadImg);
-
+#if UNITY_ANDROID || UNITY_IOS
             transform.Find("InfoButton").gameObject.SetActive(string.IsNullOrEmpty(user.Phone));
+#endif
             infoPanel.Find("Status").Find("Country").GetComponent<RawImage>().texture
                 = UIManager.Instance.loginRegOptions.GetCountryImageByName(user.Country);
             //infoPanel.Find("Status").Find("Wx").gameObject.SetActive(

Assets/Scripts/UIManager.cs

@@ -383,6 +383,49 @@ public class UIManager : MonoBehaviour
         UIManager.Show(UIManager.Instance.AndroidUpdate, null, true);
         UIManager.Instance.AndroidUpdate.StartDownload(jo);
     }
+
+    //活动页
+    private ActivityController mActivityController;
+    public ActivityController ActivityController
+    {
+        get
+        {
+            return this.GetPanelInstance("ActivityPanel", ref this.mActivityController);
+        }
+    }
+    public static void ShowActivityPanel(string url)
+    {
+        UIManager.Show(UIManager.Instance.ActivityController, null, true);
+        UIManager.Instance.ActivityController.Initial(url);
+    }
+    //活动弹窗
+    ActivityAdController mActivityAdController;
+    public ActivityAdController ActivityAdController
+    {
+        get
+        {
+            return this.GetPanelInstance("ActivityAdPanel", ref this.mActivityAdController);
+        }
+    }
+    public static void ShowActivityAdPanel(int id, string image, string url)
+    {
+        UIManager.Instance.ActivityAdController.GetComponent<ActivityAdController>().Initial(id, image, url);
+        UIManager.Show(UIManager.Instance.ActivityAdController, null, true);
+    }
+    //收货地址
+    AddressController mAddressController;
+    public AddressController AddressController
+    {
+        get
+        {
+            return this.GetPanelInstance("AddressPanel", ref this.mAddressController);
+        }
+    }
+    public static void ShowAddressPanel()
+    {
+        UIManager.Show(UIManager.Instance.AddressController, null, true);
+    }
+
     #region 比赛点击弹窗
     private RaceModalScript mRaceModalScript;
     public RaceModalScript RaceDetailModal

Assets/Scripts/Utils/Utils.cs

@@ -430,6 +430,10 @@ namespace Assets.Scripts
                 {
                     caches.Add(url, texture);
                 }
+                if (img.color.a < 1) 
+                {
+                    img.color = new Color(img.color.r, img.color.g, img.color.b, 1);
+                }
             },callback));
 
         }

Assets/UniWebView/Script/UniWebView.cs

@@ -950,7 +950,7 @@ public class UniWebView: MonoBehaviour {
         UniWebViewInterface.ClearHttpAuthUsernamePassword(host, realm);
     }
 
-    private Color backgroundColor = Color.white;
+    private Color backgroundColor = Color.black;
     /// <summary>
     /// Gets or sets the background color of web view. The default value is `Color.white`.
     /// </summary>

Assets/test.cs

@@ -1,45 +0,0 @@
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
-using UnityEngine.UI;
-
-public class test : MonoBehaviour
-{
-    // Start is called before the first frame update
-    void Start()
-    {
-        
-    }
-    public void startPage() 
-    {
-        Invoke("startPageFunc", 1f);
-    }
-    private void startPageFunc()
-    {
-        var rect = GetComponent<RectTransform>();
-        var webView = gameObject.GetComponent<UniWebView>();
-        webView.Frame = new Rect(0, 0, Screen.width, Screen.height);
-
-        webView.ReferenceRectTransform = rect;
-        // Load a URL.
-        webView.Load("http://192.168.0.101:3081");
-        // Show it.
-        webView.Show();
-        webView.OnMessageReceived -= FromJs;
-        webView.OnMessageReceived += FromJs;
-    }
-    private void FromJs(UniWebView webView, UniWebViewMessage message)
-    {
-        if (message.Path.Equals("Test")) 
-        {
-            transform.Find("Text").GetComponent<Text>().text = message.Args["msg"];
-        }
-    }
-
-    // Update is called once per frame
-    void Update()
-    {
-        
-    }
-}

ProjectSettings/AndroidResolverDependencies.xml

@@ -22,7 +22,7 @@
     <setting name="packageDir" value="Assets/Plugins/Android" />
     <setting name="patchAndroidManifest" value="True" />
     <setting name="patchMainTemplateGradle" value="True" />
-    <setting name="projectExportEnabled" value="True" />
+    <setting name="projectExportEnabled" value="False" />
     <setting name="useJetifier" value="False" />
   </settings>
 </dependencies>

ProjectSettings/GraphicsSettings.asset

@@ -38,6 +38,7 @@ 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}

ProjectSettings/ProjectSettings.asset

@@ -133,7 +133,7 @@ PlayerSettings:
     16:10: 1
     16:9: 1
     Others: 1
-  bundleVersion: 2.1.2
+  bundleVersion: 2.1.3
   preloadedAssets: []
   metroInputSource: 0
   wsaTransparentSwapchain: 0
@@ -256,7 +256,7 @@ PlayerSettings:
   clonedFromGUID: c0afd0d1d80e3634a9dac47e8a0426ea
   templatePackageId: com.unity.template.3d@4.2.8
   templateDefaultScene: Assets/Scenes/SampleScene.unity
-  AndroidTargetArchitectures: 3
+  AndroidTargetArchitectures: 1
   AndroidSplashScreenScale: 0
   androidSplashScreen: {fileID: 0}
   AndroidKeystoreName: '{inproject}: Assets/Plugins/Android/powerfun.keystore'
@@ -868,7 +868,7 @@ PlayerSettings:
   platformArchitecture:
     iPhone: 1
   scriptingBackend:
-    Android: 1
+    Android: 0
     Standalone: 0
   il2cppCompilerConfiguration:
     Standalone: 0