活动暂存

This commit is contained in:
CaiYanPeng 2022-02-11 17:26:36 +08:00
parent 17aee7a740
commit e231d3540e
12 changed files with 259 additions and 277 deletions

View File

@ -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}

View File

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

View File

@ -121,98 +121,6 @@ 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
Material:
serializedVersion: 6
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: RoundedCornersTextureMaterial(Clone)
m_Shader: {fileID: 4800000, guid: 0bd2ec5d73751e34a814274a454bec41, type: 3}
m_ShaderKeywords:
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _BumpMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailAlbedoMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailMask:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailNormalMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _EmissionMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MainTex:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MetallicGlossMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _OcclusionMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _ParallaxMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Floats:
- _BumpScale: 1
- _ColorMask: 15
- _Cutoff: 0.5
- _DetailNormalMapScale: 1
- _DstBlend: 0
- _GlossMapScale: 1
- _Glossiness: 0.5
- _GlossyReflections: 1
- _Height: 50
- _Metallic: 0
- _Mode: 0
- _OcclusionStrength: 1
- _Parallax: 0.02
- _Radius: 15
- _SmoothnessTextureChannel: 0
- _SpecularHighlights: 1
- _SrcBlend: 1
- _Stencil: 0
- _StencilComp: 8
- _StencilOp: 0
- _StencilReadMask: 255
- _StencilWriteMask: 255
- _UVSec: 0
- _UseUIAlphaClip: 0
- _Width: 50
- _ZWrite: 1
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}
--- !u!1 &845512357
GameObject:
m_ObjectHideFlags: 0
@ -564,8 +472,7 @@ RectTransform:
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 0, y: 0, z: 0}
m_Children:
- {fileID: 467445919}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -665,137 +572,3 @@ Transform:
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 48.593002, y: -4.8190002, z: -6.4140005}
--- !u!1001 &245658336666613256
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,
type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 245658337100488343, guid: cb6e4df8333395042a0b47930ac1b5d9,
type: 3}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 245658337100488343, guid: cb6e4df8333395042a0b47930ac1b5d9,
type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 245658337100488343, guid: cb6e4df8333395042a0b47930ac1b5d9,
type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 245658337100488343, guid: cb6e4df8333395042a0b47930ac1b5d9,
type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 245658337100488343, guid: cb6e4df8333395042a0b47930ac1b5d9,
type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 245658337100488343, guid: cb6e4df8333395042a0b47930ac1b5d9,
type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 245658337100488343, guid: cb6e4df8333395042a0b47930ac1b5d9,
type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 245658337100488343, guid: cb6e4df8333395042a0b47930ac1b5d9,
type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 245658337100488343, guid: cb6e4df8333395042a0b47930ac1b5d9,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 245658337100488343, guid: cb6e4df8333395042a0b47930ac1b5d9,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 245658337100488343, guid: cb6e4df8333395042a0b47930ac1b5d9,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 245658337100488343, guid: cb6e4df8333395042a0b47930ac1b5d9,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 245658337100488343, guid: cb6e4df8333395042a0b47930ac1b5d9,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5376657005773271520, guid: cb6e4df8333395042a0b47930ac1b5d9,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5376657006350838078, guid: cb6e4df8333395042a0b47930ac1b5d9,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: cb6e4df8333395042a0b47930ac1b5d9, type: 3}

View File

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

View File

@ -0,0 +1,62 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
public class ActivityController : PFUIPanel
{
Transform browser;
protected override void Awake()
{
browser = transform.Find("Browser");
UIManager.AddEvent(browser.Find("Image").gameObject, UnityEngine.EventSystems.EventTriggerType.PointerClick, b =>
{
CloseFunc();
});
}
public override void Show()
{
base.Show();
Debug.Log(20);
Invoke("StartPageFunc",1.0f);
}
private void StartPageFunc()
{
Debug.Log("开始");
var rect = browser.GetComponent<RectTransform>();
var webView = browser.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/Activity/LightUpChina");
// Show it.
webView.Show();
webView.OnMessageReceived -= FromJs;
webView.OnMessageReceived += FromJs;
}
private void FromJs(UniWebView webView, UniWebViewMessage message)
{
switch (message.Path)
{
case "Close": CloseFunc(); break;
default:break;
}
//if (message.Path.Equals("Close"))
//{
// Debug.Log(message.Args["msg"]);
// //transform.Find("Text").GetComponent<Text>().text = message.Args["msg"];
//}
}
private void CloseFunc()
{
CancelInvoke("StartPageFunc");
Close();
}
// Update is called once per frame
void Update()
{
}
}

View File

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

View File

@ -178,6 +178,8 @@ public class HomeController : PFUIPanel
//进入比赛
private void GoMatch(BaseEventData e)
{
UIManager.ShowActivityPanel();
return;
UIManager.ShowRaceHomePanel();
OnExit(e);
}

View File

@ -383,6 +383,20 @@ 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()
{
UIManager.Show(UIManager.Instance.ActivityController, null, true);
}
#region
private RaceModalScript mRaceModalScript;
public RaceModalScript RaceDetailModal

View File

@ -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()
{
}
}

View File

@ -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>

View File

@ -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}

View File

@ -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