Commit 523352ac authored by 王雪伟's avatar 王雪伟

修改包名,加入弹窗播放音乐

parent abf592aa
package com.ym.pcdxg.wxapi; package com.music.watermelon.wxapi;
import android.app.Activity; import android.app.Activity;
import android.content.Intent; import android.content.Intent;
......
...@@ -52,7 +52,6 @@ public class WxLoginUtil : MonoBehaviour ...@@ -52,7 +52,6 @@ public class WxLoginUtil : MonoBehaviour
wxCallBack(true); wxCallBack(true);
} }
Debug.unityLogger.Log("微信登录成功"); Debug.unityLogger.Log("微信登录成功");
PlayerPrefs.SetInt("didWxLogin", 1);
} }
/// <summary> /// <summary>
/// 微信绑定失败 /// 微信绑定失败
......
...@@ -37,7 +37,7 @@ ...@@ -37,7 +37,7 @@
<!-- 微信配置 --> <!-- 微信配置 -->
<activity <activity
android:name="com.ym.pcdxg.wxapi.WXEntryActivity" android:name="com.music.watermelon.wxapi.WXEntryActivity"
android:exported="true" android:exported="true"
android:launchMode="singleTop"/> android:launchMode="singleTop"/>
......
...@@ -334,6 +334,84 @@ MonoBehaviour: ...@@ -334,6 +334,84 @@ MonoBehaviour:
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
NowCell: {fileID: 0} NowCell: {fileID: 0}
--- !u!1 &1590226337620076978
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 3797343001347290407}
- component: {fileID: 4028157672166577784}
- component: {fileID: 3326727258924062719}
m_Layer: 5
m_Name: Text
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &3797343001347290407
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1590226337620076978}
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: 8290646524529520345}
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: 5.0979996, y: -31}
m_SizeDelta: {x: 582.34784, y: 240.47534}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4028157672166577784
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1590226337620076978}
m_CullTransparentMesh: 0
--- !u!114 &3326727258924062719
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1590226337620076978}
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.60784316, g: 0.6117647, b: 0.6156863, a: 1}
m_RaycastTarget: 1
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_FontData:
m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
m_FontSize: 26
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 2
m_MaxSize: 40
m_Alignment: 0
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: "1\u3001\u7531\u4E8E\u5FAE\u4FE1\u63D0\u73B0\u652F\u4ED8\u9700\u8981\u5B9E\u540D\u5236\uFF0C\u975E\u5B9E\u540D\u7528\u6237\r\n\u8D26\u53F7\u65E0\u6CD5\u652F\u6301\u63D0\u73B0\uFF0C\u8BF7\u52A1\u5FC5\u5C06\u63D0\u73B0\u7684\u5FAE\u4FE1\u53F7\u8FDB\u884C\r\n\u5B9E\u540D\u8BA4\u8BC1\uFF1B\r\n2\u3001\u5355\u7B14\u63D0\u73B0\u6700\u4F4E0.3\u5143\uFF0C\u6700\u9AD82000\u5143\uFF1B\r\n3\u3001\u63D0\u73B0\u7533\u8BF7\u901A\u5E381-3\u4E2A\u5DE5\u4F5C\u65E5\u5185\u5BA1\u6838\u5230\u8D26\uFF0C\u8BF7\u8010\r\n\u5FC3\u7B49\u5F85\uFF1B\r\n4\u3001\u5982\u53D1\u73B0\u4F5C\u5F0A\uFF0C\u5916\u6302\u7B49\u8FDD\u89C4\u624B\u6BB5\u83B7\u53D6\u5956\u52B1\uFF0C\u97F3\u4E50\u5927\u897F\u74DCw\u6709\u6743\u5224\u5B9A\u83B7\u5F97\u7684\u5956\u52B1\u65E0\u6548\u3002"
--- !u!1 &2112088965665057910 --- !u!1 &2112088965665057910
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
...@@ -843,7 +921,7 @@ GameObject: ...@@ -843,7 +921,7 @@ GameObject:
m_Icon: {fileID: 0} m_Icon: {fileID: 0}
m_NavMeshLayer: 0 m_NavMeshLayer: 0
m_StaticEditorFlags: 0 m_StaticEditorFlags: 0
m_IsActive: 1 m_IsActive: 0
--- !u!224 &2824233309781234548 --- !u!224 &2824233309781234548
RectTransform: RectTransform:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
...@@ -885,7 +963,7 @@ MonoBehaviour: ...@@ -885,7 +963,7 @@ MonoBehaviour:
m_EditorClassIdentifier: m_EditorClassIdentifier:
m_Material: {fileID: 0} m_Material: {fileID: 0}
m_Color: {r: 0.63529414, g: 0.627451, b: 0.61960787, a: 1} m_Color: {r: 0.63529414, g: 0.627451, b: 0.61960787, a: 1}
m_RaycastTarget: 1 m_RaycastTarget: 0
m_Maskable: 1 m_Maskable: 1
m_OnCullStateChanged: m_OnCullStateChanged:
m_PersistentCalls: m_PersistentCalls:
...@@ -903,7 +981,7 @@ MonoBehaviour: ...@@ -903,7 +981,7 @@ MonoBehaviour:
m_HorizontalOverflow: 0 m_HorizontalOverflow: 0
m_VerticalOverflow: 0 m_VerticalOverflow: 0
m_LineSpacing: 1 m_LineSpacing: 1
m_Text: "1.\u7531\u4E8E\u963F\u8FBE\u53D1\u53D1\u6697\u793A\u6CD5\u53F8\u6CD5" m_Text: "1\u3001\u7531\u4E8E\u5FAE\u4FE1\u63D0\u73B0\u652F\u4ED8\u9700\u8981\u5B9E\u540D\u5236\uFF0C\u975E\u5B9E\u540D\u7528\u6237\r\n\u8D26\u53F7\u65E0\u6CD5\u652F\u6301\u63D0\u73B0\uFF0C\u8BF7\u52A1\u5FC5\u5C06\u63D0\u73B0\u7684\u5FAE\u4FE1\u53F7\u8FDB\u884C\r\n\u5B9E\u540D\u8BA4\u8BC1\uFF1B\r\n2\u3001\u5355\u7B14\u63D0\u73B0\u6700\u4F4E0.3\u5143\uFF0C\u6700\u9AD82000\u5143\uFF1B\n3\u3001\u63D0\u73B0\u7533\u8BF7\u901A\u5E381-3\u4E2A\u5DE5\u4F5C\u65E5\u5185\u5BA1\u6838\u5230\u8D26\uFF0C\u8BF7\u8010\r\n\u5FC3\u7B49\u5F85\uFF1B\r\n4\u3001\u5982\u53D1\u73B0\u4F5C\u5F0A\uFF0C\u5916\u6302\u7B49\u8FDD\u89C4\u624B\u6BB5\u83B7\u53D6\u5956\u52B1\uFF0C\u591A\u591A\u5C0F\u7075\u732A\u6709\u6743\u5224\u5B9A\u83B7\u5F97\u7684\u5956\u52B1\u65E0\u6548\u3002"
--- !u!114 &3158255995645362185 --- !u!114 &3158255995645362185
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
...@@ -1234,6 +1312,7 @@ RectTransform: ...@@ -1234,6 +1312,7 @@ RectTransform:
m_Children: m_Children:
- {fileID: 6826288239860090149} - {fileID: 6826288239860090149}
- {fileID: 2824233309781234548} - {fileID: 2824233309781234548}
- {fileID: 3797343001347290407}
m_Father: {fileID: 6064660394552144844} m_Father: {fileID: 6064660394552144844}
m_RootOrder: 4 m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
...@@ -1524,9 +1603,9 @@ RectTransform: ...@@ -1524,9 +1603,9 @@ RectTransform:
m_Father: {fileID: 6064660394552144844} m_Father: {fileID: 6064660394552144844}
m_RootOrder: 0 m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMin: {x: 0.5, y: 1}
m_AnchorMax: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 1}
m_AnchoredPosition: {x: 0.000030518, y: 608.5} m_AnchoredPosition: {x: 0, y: -58.5}
m_SizeDelta: {x: 750, y: 117} m_SizeDelta: {x: 750, y: 117}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6248110235780679679 --- !u!222 &6248110235780679679
......
...@@ -133,7 +133,7 @@ MonoBehaviour: ...@@ -133,7 +133,7 @@ MonoBehaviour:
m_EditorClassIdentifier: m_EditorClassIdentifier:
m_Material: {fileID: 0} m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1} m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1 m_RaycastTarget: 0
m_Maskable: 1 m_Maskable: 1
m_OnCullStateChanged: m_OnCullStateChanged:
m_PersistentCalls: m_PersistentCalls:
...@@ -160,6 +160,7 @@ GameObject: ...@@ -160,6 +160,7 @@ GameObject:
- component: {fileID: 7993054803332402338} - component: {fileID: 7993054803332402338}
- component: {fileID: 3677300445120922412} - component: {fileID: 3677300445120922412}
- component: {fileID: 8654453945593375826} - component: {fileID: 8654453945593375826}
- component: {fileID: 1511991779548565414}
m_Layer: 5 m_Layer: 5
m_Name: MusicRedBagPanel m_Name: MusicRedBagPanel
m_TagString: Untagged m_TagString: Untagged
...@@ -241,6 +242,103 @@ MonoBehaviour: ...@@ -241,6 +242,103 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: ecd20a82c5db1e3478bfd4050ead0586, type: 3} m_Script: {fileID: 11500000, guid: ecd20a82c5db1e3478bfd4050ead0586, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
AS: {fileID: 0}
--- !u!82 &1511991779548565414
AudioSource:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4116337412256841678}
m_Enabled: 1
serializedVersion: 4
OutputAudioMixerGroup: {fileID: 0}
m_audioClip: {fileID: 0}
m_PlayOnAwake: 1
m_Volume: 1
m_Pitch: 1
Loop: 0
Mute: 0
Spatialize: 0
SpatializePostEffects: 0
Priority: 128
DopplerLevel: 1
MinDistance: 1
MaxDistance: 500
Pan2D: 0
rolloffMode: 0
BypassEffects: 0
BypassListenerEffects: 0
BypassReverbZones: 0
rolloffCustomCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 1
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 1
value: 0
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
panLevelCustomCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
spreadCustomCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
reverbZoneMixCustomCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 1
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
--- !u!1 &4240206498855502080 --- !u!1 &4240206498855502080
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
...@@ -444,6 +542,7 @@ GameObject: ...@@ -444,6 +542,7 @@ GameObject:
- component: {fileID: 7690540743409769810} - component: {fileID: 7690540743409769810}
- component: {fileID: 1749653318054063662} - component: {fileID: 1749653318054063662}
- component: {fileID: 1036092645469359446} - component: {fileID: 1036092645469359446}
- component: {fileID: 8339204171928677432}
m_Layer: 5 m_Layer: 5
m_Name: imgMusicBK m_Name: imgMusicBK
m_TagString: Untagged m_TagString: Untagged
...@@ -508,6 +607,49 @@ MonoBehaviour: ...@@ -508,6 +607,49 @@ MonoBehaviour:
m_FillOrigin: 0 m_FillOrigin: 0
m_UseSpriteMesh: 0 m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1 m_PixelsPerUnitMultiplier: 1
--- !u!114 &8339204171928677432
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6769488037135601078}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Navigation:
m_Mode: 3
m_SelectOnUp: {fileID: 0}
m_SelectOnDown: {fileID: 0}
m_SelectOnLeft: {fileID: 0}
m_SelectOnRight: {fileID: 0}
m_Transition: 1
m_Colors:
m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
m_ColorMultiplier: 1
m_FadeDuration: 0.1
m_SpriteState:
m_HighlightedSprite: {fileID: 0}
m_PressedSprite: {fileID: 0}
m_SelectedSprite: {fileID: 0}
m_DisabledSprite: {fileID: 0}
m_AnimationTriggers:
m_NormalTrigger: Normal
m_HighlightedTrigger: Highlighted
m_PressedTrigger: Pressed
m_SelectedTrigger: Selected
m_DisabledTrigger: Disabled
m_Interactable: 1
m_TargetGraphic: {fileID: 1036092645469359446}
m_OnClick:
m_PersistentCalls:
m_Calls: []
--- !u!1 &6893764928374510632 --- !u!1 &6893764928374510632
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
...@@ -569,7 +711,7 @@ MonoBehaviour: ...@@ -569,7 +711,7 @@ MonoBehaviour:
m_EditorClassIdentifier: m_EditorClassIdentifier:
m_Material: {fileID: 0} m_Material: {fileID: 0}
m_Color: {r: 1, g: 0, b: 0, a: 1} m_Color: {r: 1, g: 0, b: 0, a: 1}
m_RaycastTarget: 1 m_RaycastTarget: 0
m_Maskable: 1 m_Maskable: 1
m_OnCullStateChanged: m_OnCullStateChanged:
m_PersistentCalls: m_PersistentCalls:
......
...@@ -2,18 +2,35 @@ ...@@ -2,18 +2,35 @@
using System.Collections; using System.Collections;
using System.Collections.Generic; using System.Collections.Generic;
using UnityEngine; using UnityEngine;
using UnityEngine.Events;
using UnityEngine.Networking; using UnityEngine.Networking;
using UnityEngine.UI; using UnityEngine.UI;
public class MusicRedBagPanel : BasePanel public class MusicRedBagPanel : BasePanel
{ {
public AudioSource AS;
public override void OnHide(object data = null) public override void OnHide(object data = null)
{ {
StopMusic();
} }
public override void OnInit(object data = null) public override void OnInit(object data = null)
{ {
AS = GetComponent<AudioSource>();
GetControl<Button>("imgMusicBK").onClick.AddListener(()=> {
if (IsPlayingMusic())
{
StopMusic();
}
else
{
PlayMusic(null);
}
});
GetControl<Button>("btnOpen").onClick.AddListener(() => GetControl<Button>("btnOpen").onClick.AddListener(() =>
{ {
UIMgr.Getinstance().HidePanel<MusicRedBagPanel>(); UIMgr.Getinstance().HidePanel<MusicRedBagPanel>();
...@@ -37,6 +54,11 @@ public class MusicRedBagPanel : BasePanel ...@@ -37,6 +54,11 @@ public class MusicRedBagPanel : BasePanel
{ {
GetControl<Text>("txtMusicName").text = "你合成了歌曲“" + result.list[i].song_name + "”"; GetControl<Text>("txtMusicName").text = "你合成了歌曲“" + result.list[i].song_name + "”";
MonoMgr.Getinstance().StartCoroutine(GetTexture(result.list[i].song_cover, GetControl<Image>("imgMusicPic"))); MonoMgr.Getinstance().StartCoroutine(GetTexture(result.list[i].song_cover, GetControl<Image>("imgMusicPic")));
//开始获取音频
MonoMgr.Getinstance().StartCoroutine(GetAudioClip(result.list[i].song_play, clip =>
{
PlayMusic(clip);
}));
break; break;
} }
} }
...@@ -72,4 +94,49 @@ public class MusicRedBagPanel : BasePanel ...@@ -72,4 +94,49 @@ public class MusicRedBagPanel : BasePanel
} }
} }
} }
//设置音频的方法
IEnumerator GetAudioClip(string URL, UnityAction<AudioClip> callback)
{
using (UnityWebRequest www = UnityWebRequestMultimedia.GetAudioClip(URL, AudioType.WAV))
{
yield return www.SendWebRequest();
if (www.isNetworkError || www.isHttpError)
{
Debug.Log(www.error);
}
else
{
callback.Invoke(DownloadHandlerAudioClip.GetContent(www));
}
}
}
public bool IsPlayingMusic()
{
if (AS.clip == null)
return false;
return AS.isPlaying;
}
public void PlayMusic(AudioClip clip)
{
if(null == clip)
{
if (AS.clip!=null)
{
AS.Play();
}
return;
}
AS.clip = clip;
AS.loop = true;
AS.Play();
}
public void StopMusic()
{
AS.Pause();
// AS.clip = null;
}
} }
...@@ -270,125 +270,6 @@ Transform: ...@@ -270,125 +270,6 @@ Transform:
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_RootOrder: 0 m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1555182732
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1555182733}
- component: {fileID: 1555182736}
- component: {fileID: 1555182735}
- component: {fileID: 1555182734}
m_Layer: 5
m_Name: Login
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &1555182733
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1555182732}
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: 2146528107}
m_Father: {fileID: 1656957649}
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: 31.25595, y: -70.81531}
m_SizeDelta: {x: 160, y: 30}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1555182734
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1555182732}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Navigation:
m_Mode: 3
m_SelectOnUp: {fileID: 0}
m_SelectOnDown: {fileID: 0}
m_SelectOnLeft: {fileID: 0}
m_SelectOnRight: {fileID: 0}
m_Transition: 1
m_Colors:
m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
m_ColorMultiplier: 1
m_FadeDuration: 0.1
m_SpriteState:
m_HighlightedSprite: {fileID: 0}
m_PressedSprite: {fileID: 0}
m_SelectedSprite: {fileID: 0}
m_DisabledSprite: {fileID: 0}
m_AnimationTriggers:
m_NormalTrigger: Normal
m_HighlightedTrigger: Highlighted
m_PressedTrigger: Pressed
m_SelectedTrigger: Selected
m_DisabledTrigger: Disabled
m_Interactable: 1
m_TargetGraphic: {fileID: 1555182735}
m_OnClick:
m_PersistentCalls:
m_Calls: []
--- !u!114 &1555182735
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1555182732}
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: 10905, guid: 0000000000000000f000000000000000, type: 0}
m_Type: 1
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!222 &1555182736
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1555182732}
m_CullTransparentMesh: 0
--- !u!1 &1656957645 --- !u!1 &1656957645
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
...@@ -480,7 +361,6 @@ RectTransform: ...@@ -480,7 +361,6 @@ RectTransform:
m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0, y: 0, z: 0}
m_Children: m_Children:
- {fileID: 1555182733}
- {fileID: 1779261695} - {fileID: 1779261695}
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_RootOrder: 1 m_RootOrder: 1
...@@ -532,7 +412,7 @@ RectTransform: ...@@ -532,7 +412,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: [] m_Children: []
m_Father: {fileID: 1656957649} m_Father: {fileID: 1656957649}
m_RootOrder: 1 m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0} m_AnchorMin: {x: 0.5, y: 0}
m_AnchorMax: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0}
...@@ -576,81 +456,3 @@ CanvasRenderer: ...@@ -576,81 +456,3 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1779261694} m_GameObject: {fileID: 1779261694}
m_CullTransparentMesh: 0 m_CullTransparentMesh: 0
--- !u!1 &2146528106
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 2146528107}
- component: {fileID: 2146528109}
- component: {fileID: 2146528108}
m_Layer: 5
m_Name: Text
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &2146528107
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2146528106}
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: 1555182733}
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!114 &2146528108
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2146528106}
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.19607843, g: 0.19607843, b: 0.19607843, a: 1}
m_RaycastTarget: 1
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_FontData:
m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
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: Button
--- !u!222 &2146528109
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2146528106}
m_CullTransparentMesh: 0
...@@ -12,8 +12,8 @@ PlayerSettings: ...@@ -12,8 +12,8 @@ PlayerSettings:
targetDevice: 2 targetDevice: 2
useOnDemandResources: 0 useOnDemandResources: 0
accelerometerFrequency: 60 accelerometerFrequency: 60
companyName: "\u97F3\u4E50\u5927\u897F\u74DC" companyName: music
productName: MusicBigWatermelon productName: "\u97F3\u4E50\u5927\u897F\u74DC"
defaultCursor: {fileID: 0} defaultCursor: {fileID: 0}
cursorHotspot: {x: 0, y: 0} cursorHotspot: {x: 0, y: 0}
m_SplashScreenBackgroundColor: {r: 0.13725491, g: 0.12156863, b: 0.1254902, a: 1} m_SplashScreenBackgroundColor: {r: 0.13725491, g: 0.12156863, b: 0.1254902, a: 1}
...@@ -175,7 +175,7 @@ PlayerSettings: ...@@ -175,7 +175,7 @@ PlayerSettings:
androidSupportedAspectRatio: 1 androidSupportedAspectRatio: 1
androidMaxAspectRatio: 2.1 androidMaxAspectRatio: 2.1
applicationIdentifier: applicationIdentifier:
Android: com.ym.pcdxg Android: com.music.watermelon
buildNumber: {} buildNumber: {}
AndroidBundleVersionCode: 1 AndroidBundleVersionCode: 1
AndroidMinSdkVersion: 19 AndroidMinSdkVersion: 19
...@@ -271,7 +271,14 @@ PlayerSettings: ...@@ -271,7 +271,14 @@ PlayerSettings:
androidGamepadSupportLevel: 0 androidGamepadSupportLevel: 0
AndroidValidateAppBundleSize: 1 AndroidValidateAppBundleSize: 1
AndroidAppBundleSizeToValidate: 150 AndroidAppBundleSizeToValidate: 150
m_BuildTargetIcons: [] m_BuildTargetIcons:
- m_BuildTarget:
m_Icons:
- serializedVersion: 2
m_Icon: {fileID: 2800000, guid: c8acfe47e8b09174cbf361cd8eb6b456, type: 3}
m_Width: 128
m_Height: 128
m_Kind: 0
m_BuildTargetPlatformIcons: m_BuildTargetPlatformIcons:
- m_BuildTarget: Android - m_BuildTarget: Android
m_Icons: m_Icons:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment