Skip to content

M
MusicBigWatermelon
Commit a06160ca authored by LiLiuZhou's avatar LiLiuZhou
Browse files
Options

Merge branch 'master' of gitlab.huolea.com:wangxuewei/musicbigwatermelon

parents 4a82cfaa 9ad959bd
Expand all Show whitespace changes
Inline Side-by-side
Showing with 370 additions and 618 deletions
Assets/Artres/Main/note1.png.meta 0 → 100644
View file @ a06160ca
fileFormatVersion: 2
guid: 39705d929dfda5040a9b0628dc0ed7f7
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
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/Artres/Main/note2.png.meta 0 → 100644
View file @ a06160ca
fileFormatVersion: 2
guid: 75805f8d3dcfc2648a4907ab6188ad96
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
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/Artres/Main/note3.png.meta 0 → 100644
View file @ a06160ca
fileFormatVersion: 2
guid: a8b467a8e79625e49b7023066fd5296e
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
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/Base/UnityTool/HTTP/HttpTool.cs
View file @ a06160ca
...@@ -141,34 +141,6 @@ public class HttpTool : MonoBehaviour ...@@ -141,34 +141,6 @@ public class HttpTool : MonoBehaviour
failed(response.status.ToString(), response.msg); failed(response.status.ToString(), response.msg);
} }
} }
//try
//{
// Response<T> response = JsonMapper.ToObject<Response<T>>(json);
// if (response.status==200)
// {
// success(response.result.data);
// }
// else
// {
// if (response.status==105)
// {
// //提示信息
// ToastPlugin.ToastHelper.ShowToast(response.msg);
// }
// if (failed != null)
// {
// failed(response.status.ToString(), response.msg);
// }
// }
//}
//catch (Exception e)
//{
// if (failed != null)
// {
// failed("-2", e.Message);
// }
//}
} }
} }
...@@ -182,11 +154,11 @@ public class HttpTool : MonoBehaviour ...@@ -182,11 +154,11 @@ public class HttpTool : MonoBehaviour
Dictionary<string, object> paragrams = request; Dictionary<string, object> paragrams = request;
paragrams["pkg"] = Constant.Instance.Pkg; //paragrams["pkg"] = Constant.Instance.Pkg;
//paragrams["appLs"] = Constant.Instance.AppLs; //paragrams["appLs"] = Constant.Instance.AppLs;
paragrams["uid"] = Constant.Instance.Uid; //paragrams["uid"] = Constant.Instance.Uid;
paragrams["token"] = Constant.Instance.Token; paragrams["token"] = Constant.Instance.Token;
paragrams["device"] = UnityPhoneUtils.Instance.GetDevice(); //paragrams["device"] = UnityPhoneUtils.Instance.GetDevice();
foreach (KeyValuePair<string, object> item in paragrams) foreach (KeyValuePair<string, object> item in paragrams)
{ {
......
Assets/Base/UnityTool/HTTP/Response.cs
View file @ a06160ca
...@@ -12,5 +12,8 @@ public class Response<T> ...@@ -12,5 +12,8 @@ public class Response<T>
public class Result<T> public class Result<T>
{ {
public T data = default; public T data = default;
public int next_song_id { get; set; }
public string song_id { get; set; }
} }
} }
Assets/Resources/UI/Panel/ForFruitPanel.prefab deleted 100644 → 0
View file @ 4a82cfaa
This diff is collapsed.
Assets/Scripts/Controllers/GameController.cs
View file @ a06160ca
...@@ -34,12 +34,47 @@ public class GameController : MonoBehaviour ...@@ -34,12 +34,47 @@ public class GameController : MonoBehaviour
paras.Add("song_id", song_id); paras.Add("song_id", song_id);
HttpTool.Instance._Get("app/v1/watermelon/notes", paras, new Action<List<string>>((result) => HttpTool.Instance._Get("app/v1/watermelon/notes", paras, new Action<List<string>>((result) =>
{ {
Debug.unityLogger.Log("");
}), new Action<string, string>((code, msg) => }), new Action<string, string>((code, msg) =>
{ {
Debug.unityLogger.Log("获取下一组生成的球 " + code + " msg " + msg); Debug.unityLogger.Log("获取下一组生成的球 " + code + " msg " + msg);
})); }));
} }
/// <summary>
/// 获取提现列表
/// 类型（1 合成提现，3大额提现）
/// </summary>
public void GetWithdrawList(int type)
{
Dictionary<string, object> paras = new Dictionary<string, object>();
paras.Add("type", type);
HttpTool.Instance._Get("app/v1/watermelon/list_wd", paras, new Action<EmptyBean>((result) =>
{
}), new Action<string, string>((code, msg) =>
{
Debug.unityLogger.Log("获取提现列表 " + code + " msg " + msg);
}));
}
/// <summary>
/// 获取歌曲列表
/// </summary>
public void GetSongsList(int song_id)
{
Dictionary<string, object> paras = new Dictionary<string, object>();
paras.Add("song_id", song_id);
HttpTool.Instance._Get("app/v1/watermelon/songs_list", paras, new Action<EmptyBean>((result) =>
{
}), new Action<string, string>((code, msg) =>
{
Debug.unityLogger.Log("获取歌曲列表 " + code + " msg " + msg);
}));
}
} }
Assets/Scripts/Main/AudioManager.cs 0 → 100644
View file @ a06160ca
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
public class AudioManager : MonoBehaviour
{
private AudioSource mAudiSource;
public static AudioManager Instance;
private void Awake()
{
Instance = this;
mAudiSource = GetComponent<AudioSource>();
}
public IEnumerator LoadAudio(string recordPath)
{
// www 加载音频
WWW www = new WWW(recordPath);
yield return www;
var clipTemp = www.GetAudioClip();
mAudiSource.clip = clipTemp;
//播放音频
mAudiSource.Play();
}
private void Update()
{
Debug.unityLogger.Log("是否暂停"+ mAudiSource.isPlaying);
}
public void StopPlay()
{
}
}
Assets/Resources/UI/Panel/ForFruitPanel.prefab.meta → Assets/Scripts/Main/AudioManager.cs.meta
View file @ a06160ca
fileFormatVersion: 2 fileFormatVersion: 2
guid: 3c540c4209fff154c9335635df53b504 guid: 26c4e5df19049a3418e09a5e9c51f14c
PrefabImporter: MonoImporter:
externalObjects: {} externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData: userData:
assetBundleName: assetBundleName:
assetBundleVariant: assetBundleVariant:
Assets/Scripts/Model/EmptyBean.cs
View file @ a06160ca
 using System;
[Serializable]
public class EmptyBean public class EmptyBean
{ {
......
ProjectSettings/ProjectSettings.asset
View file @ a06160ca
...@@ -12,7 +12,7 @@ PlayerSettings: ...@@ -12,7 +12,7 @@ PlayerSettings:
targetDevice: 2 targetDevice: 2
useOnDemandResources: 0 useOnDemandResources: 0
accelerometerFrequency: 60 accelerometerFrequency: 60
companyName: DefaultCompany companyName: "\u97F3\u4E50\u5927\u897F\u74DC"
productName: MusicBigWatermelon productName: MusicBigWatermelon
defaultCursor: {fileID: 0} defaultCursor: {fileID: 0}
cursorHotspot: {x: 0, y: 0} cursorHotspot: {x: 0, y: 0}
...@@ -131,7 +131,7 @@ PlayerSettings: ...@@ -131,7 +131,7 @@ PlayerSettings:
16:10: 1 16:10: 1
16:9: 1 16:9: 1
Others: 1 Others: 1
bundleVersion: 0.1 bundleVersion: 1.0.1
preloadedAssets: [] preloadedAssets: []
metroInputSource: 0 metroInputSource: 0
wsaTransparentSwapchain: 0 wsaTransparentSwapchain: 0
...@@ -174,7 +174,8 @@ PlayerSettings: ...@@ -174,7 +174,8 @@ PlayerSettings:
resolutionScalingMode: 0 resolutionScalingMode: 0
androidSupportedAspectRatio: 1 androidSupportedAspectRatio: 1
androidMaxAspectRatio: 2.1 androidMaxAspectRatio: 2.1
applicationIdentifier: {} applicationIdentifier:
Android: com.ym.pcdxg
buildNumber: {} buildNumber: {}
AndroidBundleVersionCode: 1 AndroidBundleVersionCode: 1
AndroidMinSdkVersion: 19 AndroidMinSdkVersion: 19
......
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