Skip to content

F
First_FKQCW
Commit 76f516e6 authored by maxiaoliang's avatar maxiaoliang
Browse files
Options

修改bug

parent 18a01e1c
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 3426 additions and 56 deletions
Assets/Game/Main/Resource/Guide/下一步-2.png.meta 0 → 100644
View file @ 76f516e6
fileFormatVersion: 2
guid: f9acf351684774e738665b72d6e3af1f
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/Game/Main/Resource/Guide/组 1-4.png.meta 0 → 100644
View file @ 76f516e6
fileFormatVersion: 2
guid: fe00f68773e354d67b6e95c6c8de40af
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/Game/Main/Resource/Guide/组 1-5.png.meta 0 → 100644
View file @ 76f516e6
fileFormatVersion: 2
guid: 22c46f3425f8e4b29ac499449c37973d
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/Game/Main/Resource/Guide/组 1-6.png.meta 0 → 100644
View file @ 76f516e6
fileFormatVersion: 2
guid: e5afaf2dfd4604b92ad50c89b74c806d
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/Game/Main/Resource/Guide/组 1-7.png.meta 0 → 100644
View file @ 76f516e6
fileFormatVersion: 2
guid: af240f84adb4e4ed992f2ed280ba3556
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/Game/Main/Resource/Guide/组 1-8.png.meta 0 → 100644
View file @ 76f516e6
fileFormatVersion: 2
guid: bb79360e9dfeb4b7da7438da4ed3de39
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/Game/Main/Scenes/CrazyCar.unity
View file @ 76f516e6
This diff is collapsed.
Assets/Game/Main/Scripts/Presenter/CarPresenter.cs
View file @ 76f516e6
......@@ -76,6 +76,7 @@ public class CarPresenter : CarContract.Presenter
}));
}
//升级车
public void GetUpdateCar(int parkingSpaceId)
{
parm.Clear();
......@@ -89,7 +90,7 @@ public class CarPresenter : CarContract.Presenter
}), new Action<string, string>((code, errMsg) =>
{
GameObject.Find("Dialog").GetComponent<DialogControl>().showGoldInsufficientDialog();
}));
}
public void GetUnLockCar(int parkingSpaceId)
......
Assets/Game/Main/Scripts/Utils/Guide.cs
View file @ 76f516e6
......@@ -8,6 +8,7 @@ public class Guide : MonoBehaviour
public GameObject Car4Parent,Car4Bottom;
public GameObject Car4Obj;
public GameObject flyBox;
public GameObject click6, click7, click8, click9, click10;
private int carListNum;
public static Guide guide;
private bool isStartShow = false;
......@@ -20,6 +21,10 @@ public class Guide : MonoBehaviour
private string step4Key = "step4Key";
private string step5Key = "step5Key";
private string step6Key = "step6Key";
private string step7Key = "step7Key";
private string step8Key = "step8Key";
private string step9Key = "step9Key";
private string step10Key = "step10Key";
private void Awake()
......@@ -38,14 +43,14 @@ public class Guide : MonoBehaviour
isStartShow = true;
IsNewUser = isUser;
DissmissGuide(false);
if (IsNewUser)
{
flyBox.SetActive(false);
}
else
{
flyBox.SetActive(true);
}
//if (IsNewUser)
//{
// flyBox.SetActive(false);
//}
//else
//{
// flyBox.SetActive(true);
//}
if (PlayerPrefs.GetInt(step1Key, 0) == 0)
{
if (PlayerDataControl.Instance.IsNewUser)
......@@ -131,14 +136,14 @@ public class Guide : MonoBehaviour
hand_5.SetActive(true);
}
}
flyBox.SetActive(true);
//flyBox.SetActive(true);
//if (PlayerDataControl.Instance.IsNewUser)
//{
// ObjStep6.SetActive(true);
// hand_6.SetActive(true);
//}
//IsNewUser = false;
//PlayerDataControl.Instance.IsNewUser = false;
IsNewUser = false;
PlayerDataControl.Instance.IsNewUser = false;
}
public void onClickStep5()
......@@ -149,16 +154,64 @@ public class Guide : MonoBehaviour
hand_5.SetActive(false);
if (PlayerPrefs.GetInt(step6Key, 0) == 0)
{
if (PlayerDataControl.Instance.IsNewUser)
{
PlayerPrefs.SetInt(step6Key, 0);
ObjStep6.SetActive(true);
hand_6.SetActive(true);
}
PlayerPrefs.SetInt(step6Key, 1);
click6.SetActive(true);
//if (PlayerDataControl.Instance.IsNewUser)
//{
// //ObjStep6.SetActive(true);
// //hand_6.SetActive(true);
// click6.SetActive(true);
//}
}
IsNewUser = false;
PlayerDataControl.Instance.IsNewUser = false;
//IsNewUser = false;
//PlayerDataControl.Instance.IsNewUser = false;
}
public void onclick6()
{
click6.SetActive(false);
if (PlayerPrefs.GetInt(step7Key, 0) == 0)
{
PlayerPrefs.SetInt(step7Key, 1);
click7.SetActive(true);
}
}
public void onclick7()
{
click7.SetActive(false);
if (PlayerPrefs.GetInt(step8Key, 0) == 0)
{
PlayerPrefs.SetInt(step8Key, 1);
click8.SetActive(true);
}
}
public void onclick8()
{
click8.SetActive(false);
if (PlayerPrefs.GetInt(step9Key, 0) == 0)
{
PlayerPrefs.SetInt(step9Key, 1);
click9.SetActive(true);
}
}
public void onclick9()
{
click9.SetActive(false);
if (PlayerPrefs.GetInt(step10Key, 0) == 0)
{
PlayerPrefs.SetInt(step10Key, 1);
click10.SetActive(true);
}
}
public void onclick10()
{
click10.SetActive(false);
if (PlayerPrefs.GetInt(step10Key, 0) == 0)
{
PlayerPrefs.SetInt(step10Key, 1);
}
}
public void onClickStep6()
......
Assets/Game/Main/Scripts/View/DialogControl.cs
View file @ 76f516e6
......@@ -406,6 +406,7 @@ public class DialogControl : MonoBehaviour
public void showGoldInsufficientDialog()
{
GoldInsufficientDialog.SetActive(true);
}
public void closeGoldInsufficientDialog()
......
Assets/Game/Main/Scripts/View/HomeInfoControl.cs
View file @ 76f516e6
......@@ -94,7 +94,7 @@ public class HomeInfoControl : MonoBehaviour, HomeContract.View
ParkListInfo(mCarInfo.parkingSpaceList);
setProction(mCarInfo.protectionCountdownSecond);
tvrewardCoinEveryMinute.text = "<size=33>" + mCarInfo.rewardCoinEveryMinute + "</size>"+"<size=25>/分钟</size>";
tvrewardCashEveryMinute.text = "约"+mCarInfo.rewardCashEveryMinute.ToString()+ "/分钟";
tvrewardCashEveryMinute.text = "约"+mCarInfo.rewardCashEveryMinute.ToString()+ "元/分钟";
levelTv.text = "Lv:"+mCarInfo.levelProgress.level;
}
......
Assets/Game/Main/Scripts/View/MyGarageControl.cs
View file @ 76f516e6
......@@ -47,7 +47,7 @@ public class MyGarageControl : MonoBehaviour, MyGarageContract.View
//关闭车库面板
public void OnClickCloseGaragePanel()
{
Guide.guide.onClickStep6();
// Guide.guide.onClickStep6();
EventCenter.Broadcast(MyEventType.CLOSE_PANEL);
transform.DOLocalMoveY(mDefaultPosY, 0.5f).SetEase(Ease.OutQuart);
}
......
Assets/Game/Main/Scripts/View/MyGarageItem.cs
View file @ 76f516e6
......@@ -87,7 +87,7 @@ public class MyGarageItem : MonoBehaviour
parm.Add("carId", CarId);
HttpTool.Instance._Post("app/v1/game/fkqcw/parking/upgrade", parm, new Action<MyDriverBean>((bean) =>
{
Guide.guide.onClickStep6();
// Guide.guide.onClickStep6();
//更新车库列表
EventCenter.Broadcast(MyEventType.UPDATE_GARAGE);
//更新车库列表
......
Assets/Game/Main/Scripts/View/ProtectionControl.cs
View file @ 76f516e6
......@@ -69,7 +69,7 @@ public class ProtectionControl : MonoBehaviour
public void OnClcikProtion()
{
GameObject.Find("Dialog").GetComponent<DialogControl>().closeProtectionCoverDialog();
AdUtils.PlayRewardAd("proction_reward", new Action<bool>((cb) =>
AdUtils.PlayRewardAd("fkqcw_protection", new Action<bool>((cb) =>
{
if (cb)
{
......
Assets/Game/Main/Scripts/item/EveryDayItem.cs
View file @ 76f516e6
......@@ -35,7 +35,7 @@ public class EveryDayItem : MonoBehaviour
if (taskItemDate.status == 1)
{
//TODO 看视频领红心
GameObject.Find("WithdrawalEveryDayCanvas").GetComponent<EveryDayControl>().videoGetHeart(taskItemDate.sid);
GameObject.Find("DayWithDraw").GetComponent<EveryDayControl>().videoGetHeart(taskItemDate.sid);
}
else
{
......
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