Skip to content

W
wdlc_mjb_unity
Commit 732644fe authored by zhangzhe's avatar zhangzhe
Browse files
Options

Merge branch 'develop_mjb_cscmnq_1.0.5' of… 

Merge branch 'develop_mjb_cscmnq_1.0.5' of gitlab.huolea.com:wangxuewei/wdlc_mjb_unity into develop_mjb_cscmnq_1.0.5
parents 9e294d6a d01bf118
Expand all Show whitespace changes
Inline Side-by-side
Showing with 2877 additions and 3656 deletions
Assets/Game/Main/Prefabs/WithdrawalEveryDayCanvas.prefab deleted 100644 → 0
View file @ 9e294d6a
This source diff could not be displayed because it is too large. You can view the blob instead.
Assets/Game/Main/Prefabs/WithdrawalEveryDayItem.prefab
View file @ 732644fe
......@@ -247,7 +247,7 @@ RectTransform:
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 236, y: 0}
m_SizeDelta: {x: 170, y: 79}
m_SizeDelta: {x: 152, y: 79}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4820329151650945109
CanvasRenderer:
......
Assets/Game/Main/Prefabs/caomeiItem.prefab 0 → 100644
View file @ 732644fe
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &7736034002304559382
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 48928979346172635}
- component: {fileID: 8468684189662209177}
- component: {fileID: 2967458986597191605}
m_Layer: 5
m_Name: img_lookvideo
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &48928979346172635
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7736034002304559382}
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: 8311411286583156725}
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: 63, y: 64}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8468684189662209177
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7736034002304559382}
m_CullTransparentMesh: 0
--- !u!114 &2967458986597191605
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7736034002304559382}
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: 5ed9411e4a55a43a28bac8fffd117bef, 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 &8311411286583156724
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 8311411286583156725}
- component: {fileID: 8311411286583156723}
- component: {fileID: 8311411286583156722}
- component: {fileID: 2470504555031176619}
- component: {fileID: 1270439629530722720}
m_Layer: 5
m_Name: caomeiItem
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &8311411286583156725
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8311411286583156724}
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: 48928979346172635}
m_Father: {fileID: 0}
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: -157, y: 173}
m_SizeDelta: {x: 190, y: 167}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8311411286583156723
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8311411286583156724}
m_CullTransparentMesh: 0
--- !u!114 &8311411286583156722
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8311411286583156724}
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: a9910ea949548470db674c783fad8128, 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!114 &2470504555031176619
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8311411286583156724}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 0a2c3081fcc6841febcaf4664f3dd516, type: 3}
m_Name:
m_EditorClassIdentifier:
ItemBg: {fileID: 8311411286583156722}
img_look_video: {fileID: 7736034002304559382}
GraySprites:
- {fileID: 21300000, guid: cfb841383d8c24acab4ee304d3e26f0c, type: 3}
- {fileID: 21300000, guid: 912d91e2edff646478c996acd3f01b71, type: 3}
- {fileID: 21300000, guid: 55c1b2638715b4c9185363fcd8362d94, type: 3}
- {fileID: 21300000, guid: 7115149d9274a49749d18fa94dfef6d6, type: 3}
- {fileID: 21300000, guid: 8190d4b0f71734f99b5ac2c714364977, type: 3}
- {fileID: 21300000, guid: 81fb12b5d554945fa8bf987dc23317ed, type: 3}
- {fileID: 21300000, guid: b7510e0c2f8254b9895372931c29283e, type: 3}
- {fileID: 21300000, guid: 7c023c398a1204adf9e0ac64a796244a, type: 3}
- {fileID: 21300000, guid: 0e2df0b994f9e48008b236019e0b7f04, type: 3}
lightSprites:
- {fileID: 21300000, guid: a9910ea949548470db674c783fad8128, type: 3}
- {fileID: 21300000, guid: 4bcdbe560d55e4aa7a41ffd3a063bc8d, type: 3}
- {fileID: 21300000, guid: 1a58ff91cc1c440cdab30a24020a24d4, type: 3}
- {fileID: 21300000, guid: 17766a4e709244534b476faad56e9c51, type: 3}
- {fileID: 21300000, guid: 21927bd797c674a248bfe8613bc2d18b, type: 3}
- {fileID: 21300000, guid: fb1ed7bd34c4b4ccd9d7f5e2bc455047, type: 3}
- {fileID: 21300000, guid: 69c32a89f19c14037b8738bcbe450c08, type: 3}
- {fileID: 21300000, guid: bfdcbf4c6908140fea9baf83e164d561, type: 3}
- {fileID: 21300000, guid: 2fe185c7bb85e4333b2a0e373b375d7a, type: 3}
--- !u!114 &1270439629530722720
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8311411286583156724}
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: 8311411286583156722}
m_OnClick:
m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 2470504555031176619}
m_MethodName: clickLookVideo
m_Mode: 1
m_Arguments:
m_ObjectArgument: {fileID: 0}
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
m_IntArgument: 0
m_FloatArgument: 0
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
Assets/Game/Main/Prefabs/WithdrawalEveryDayCanvas.prefab.meta → Assets/Game/Main/Prefabs/caomeiItem.prefab.meta
View file @ 732644fe
fileFormatVersion: 2
guid: c45494481b11649db91330b45f0da626
guid: b92c42fd55d7045d7b682bcb1473ceeb
PrefabImporter:
externalObjects: {}
userData:
......
Assets/Game/Main/Resource/ui/WithdrawEveryDay/桃心(1).png.meta deleted 100644 → 0
View file @ 9e294d6a
fileFormatVersion: 2
guid: 578904149e1bd4550ac400d6429070e0
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/ui/拼图解锁状态.png.meta deleted 100644 → 0
View file @ 9e294d6a
fileFormatVersion: 2
guid: fbab3fb5698e0496d9d15f9677fbc57f
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 @ 732644fe
This diff is collapsed.
Assets/Game/Main/Scripts/Item/CaomeiItem.cs 0 → 100644
View file @ 732644fe
using System;
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
using UnityEngine.UI;
public class CaomeiItem : MonoBehaviour
{
public Image ItemBg;
public GameObject img_look_video;
public Sprite[] GraySprites,lightSprites;
public CaoMeiListBean item;
public void setItemData(CaoMeiListBean bean)
{
item = bean;
if (bean.status == 0)
{
img_look_video.SetActive(true);
}
else
{
img_look_video.SetActive(false);
}
switch (bean.id)
{
case 1:
if (bean.status == 0)
{
ItemBg.sprite = GraySprites[0];
}
else
{
ItemBg.sprite = lightSprites[0];
}
break;
case 2:
if (bean.status == 0)
{
ItemBg.sprite = GraySprites[1];
}
else
{
ItemBg.sprite = lightSprites[1];
}
break;
case 3:
if (bean.status == 0)
{
ItemBg.sprite = GraySprites[2];
}
else
{
ItemBg.sprite = lightSprites[2];
}
break;
case 4:
if (bean.status == 0)
{
ItemBg.sprite = GraySprites[3];
}
else
{
ItemBg.sprite = lightSprites[3];
}
break;
case 5:
if (bean.status == 0)
{
ItemBg.sprite = GraySprites[4];
}
else
{
ItemBg.sprite = lightSprites[4];
}
break;
case 6:
if (bean.status == 0)
{
ItemBg.sprite = GraySprites[5];
}
else
{
ItemBg.sprite = lightSprites[5];
}
break;
case 7:
if (bean.status == 0)
{
ItemBg.sprite = GraySprites[6];
}
else
{
ItemBg.sprite = lightSprites[6];
}
break;
case 8:
if (bean.status == 0)
{
ItemBg.sprite = GraySprites[7];
}
else
{
ItemBg.sprite = lightSprites[7];
}
break;
case 9:
if (bean.status == 0)
{
ItemBg.sprite = GraySprites[8];
}
else
{
ItemBg.sprite = lightSprites[8];
}
break;
}
}
public void clickLookVideo()
{
if (item.status == 1)
{
return;
}
AdUtils.PlayRewardAd("caomei_addProcess", new Action<bool>((cb) =>
{
if (cb)
{
Dictionary<string, object> parm = new Dictionary<string, object>();
parm.Clear();
parm.Add("id", item.id);
HttpTool.Instance._Post("app/v1/game/module/jigsaw/addProgress", parm, new Action<CaoMeiListBean>((bean) =>
{
setItemData(bean);
}), new Action<string, string>((code, errMsg) =>
{
Debug.unityLogger.Log("一盒草莓(拼图) - 增加进度 请求失败" + code + errMsg);
}));
}
}));
}
}
Assets/AdSDK/AD/CSJ.meta → Assets/Game/Main/Scripts/Item/CaomeiItem.cs.meta
View file @ 732644fe
fileFormatVersion: 2
guid: 047afee41e5ea4041b38650dde06204e
folderAsset: yes
DefaultImporter:
guid: 0a2c3081fcc6841febcaf4664f3dd516
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
Assets/Game/Main/Scripts/Model/CaoMeiListBean.cs 0 → 100644
View file @ 732644fe
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
public class CaoMeiListBean
{
public int id;
public int status;
}
Assets/Game/Main/Scripts/Model/CaoMeiListBean.cs.meta 0 → 100644
View file @ 732644fe
fileFormatVersion: 2
guid: 6ca778e70a3f248aca38bacb9e1c0b90
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
Assets/Game/Main/Scripts/Model/CaoMeiReceiveBean.cs 0 → 100644
View file @ 732644fe
using System;
public class CaoMeiReceiveBean
{
public string res;
public int reward;
}
Assets/Game/Main/Scripts/Model/CaoMeiReceiveBean.cs.meta 0 → 100644
View file @ 732644fe
fileFormatVersion: 2
guid: 4e8170f061d634ab3b13ab04c152efb8
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
Assets/Game/Main/Scripts/View/CaomeiControl.cs 0 → 100644
View file @ 732644fe
using System;
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
public class CaomeiControl : MonoBehaviour
{
public GameObject caomeiDialog;
public GameObject[] items;
private void OnEnable()
{
getjigsawList();
}
//获取一盒草莓拼图列表
private void getjigsawList()
{
HttpTool.Instance._Get("app/v1/game/module/jigsaw", null,
new Action<List<CaoMeiListBean>>((result) => {
if (null != result)
{
for(int i = 0; i < result.Count; i++)
{
items[i].GetComponent<CaomeiItem>().setItemData(result[i]);
}
}
}), new Action<string, string>((code, mes) => {
}));
}
//领取奖励
public void GetReceive()
{
HttpTool.Instance._Get("app/v1/game/module/jigsaw/reward", null,
new Action<CaoMeiReceiveBean>((result) => {
closeCaomeiDialog();
GameObject.Find("Dialog").GetComponent<DialogControl>().showTaoxinDialog(result.reward);
}), new Action<string, string>((code, mes) => {
}));
}
//关闭弹窗
public void closeCaomeiDialog()
{
caomeiDialog.SetActive(false);
}
}
Assets/Game/Main/Scripts/View/CaomeiControl.cs.meta 0 → 100644
View file @ 732644fe
fileFormatVersion: 2
guid: 061d8992a88094d70aa4d5f92d753da9
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
Assets/Game/Main/Scripts/View/DialogControl.cs
View file @ 732644fe
......@@ -39,6 +39,8 @@ public class DialogControl : MonoBehaviour
private int a;
private static Dictionary<string, object> parm = new Dictionary<string, object>();
public GameObject rain;
public GameObject taoxinDialog;//获得草莓弹窗
public Text tv_taoxin_num;
private void Awake()
{
EventCenter.AddListener<VideoStatusBean>(MyEventType.WATET_DIALOG, OnUseWaterByVideo);
......@@ -974,5 +976,16 @@ public class DialogControl : MonoBehaviour
}
}
public void showTaoxinDialog(int rewardcount)
{
taoxinDialog.SetActive(true);
tv_taoxin_num.text = receivediamond.ToString();
}
public void closeTaoxinDialog()
{
AudioUtils.ins.PlayBtnAudio();
taoxinDialog.SetActive(false);
}
}
Assets/Game/Main/Scripts/View/HomeInfoControl.cs
View file @ 732644fe
......@@ -20,7 +20,7 @@ public class HomeInfoControl : MonoBehaviour, HomeContract.View
public Text tv_trips_cash,tv_pig_tomorrow_cash, tv_passRewardToday;
public GameObject redpack,diamond,pig_red_pack;
public GameObject oneimg, twoimg, threeimg,fourimg;
public GameObject baiyuanhongbao;
public GameObject baiyuanhongbao,caomeiDialog;
private void Awake()
{
mPresenter = new HomePresenter(this);
......@@ -644,6 +644,6 @@ public class HomeInfoControl : MonoBehaviour, HomeContract.View
public void clickStrawberries()
{
AudioUtils.ins.PlayBtnAudio();
Debug.Log("点击草莓");
caomeiDialog.SetActive(true);
}
}
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