Skip to content

W
wdlc_mjb_unity
Commit 17ea30ab authored by maxiaoliang's avatar maxiaoliang
Browse files
Options

修改问题

parent 9932ede1
Show whitespace changes
Inline Side-by-side
Showing with 135 additions and 45 deletions
Assets/AdSDK/InitProject/InitScene.unity
View file @ 17ea30ab
......@@ -322,7 +322,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: 8b8f83505adf9434f921a7db9b12cc2c, type: 3}
m_Sprite: {fileID: 21300000, guid: 5db91ac454f5d4a039c95e89c6d46b62, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
......
Assets/Game/Main/Prefabs/Car.prefab
View file @ 17ea30ab
......@@ -1025,7 +1025,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: 185b2ac2d371f4fa8a0dcdd11d330138, type: 3}
m_Sprite: {fileID: 21300000, guid: 3c82b7790f4b7429c8a54b7372c62967, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
......@@ -1982,14 +1982,14 @@ RectTransform:
m_GameObject: {fileID: 455528768893061786}
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_LocalScale: {x: 0.9, y: 0.9, z: 1}
m_Children: []
m_Father: {fileID: 455528767290619777}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.1, y: 0.1}
m_AnchorMax: {x: 0.3, y: 0.3}
m_AnchoredPosition: {x: 107.499954, y: 44.69999}
m_AnchoredPosition: {x: 106, y: 36}
m_SizeDelta: {x: 196, y: 162}
m_Pivot: {x: 0.5, y: 0.1}
--- !u!222 &455528768893061783
......@@ -1999,7 +1999,7 @@ CanvasRenderer:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 455528768893061786}
m_CullTransparentMesh: 0
m_CullTransparentMesh: 1
--- !u!114 &455528768893061780
MonoBehaviour:
m_ObjectHideFlags: 0
......@@ -2019,7 +2019,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: 185b2ac2d371f4fa8a0dcdd11d330138, type: 3}
m_Sprite: {fileID: 21300000, guid: 07e7c47f587414ecfa2292dc9e01c603, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
......@@ -3082,7 +3082,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &4059768334035259752
RectTransform:
m_ObjectHideFlags: 0
......@@ -3124,7 +3124,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_RaycastTarget: 0
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
......
Assets/Game/Main/Scenes/CrazyCar.unity
View file @ 17ea30ab
......@@ -7777,9 +7777,9 @@ RectTransform:
m_Father: {fileID: 1548415916}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 355, y: -72.5}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 355, y: 0}
m_SizeDelta: {x: 710, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &300181110
......@@ -14441,7 +14441,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: 0.00055163977}
m_SizeDelta: {x: -698, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0, y: 1}
--- !u!114 &508766706
MonoBehaviour:
......@@ -18991,19 +18991,8 @@ MonoBehaviour:
m_OnClick:
m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 2012954741}
m_MethodName: JumpWithDraw
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
- m_Target: {fileID: 1343088502}
m_MethodName: GetWithDrawPageInfo
- m_Target: {fileID: 716226833}
m_MethodName: clickWithDrawBg
m_Mode: 1
m_Arguments:
m_ObjectArgument: {fileID: 0}
......@@ -20004,7 +19993,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
m_IsActive: 1
--- !u!224 &703432076
RectTransform:
m_ObjectHideFlags: 0
......@@ -20429,6 +20418,17 @@ MonoBehaviour:
item_prefab: {fileID: 4313061083253950001, guid: 68900ab454c984c2d9184c156e08f810,
type: 3}
cashTitleDescTv: {fileID: 1440887900}
img_bottom_icon: {fileID: 534080037}
lables:
- {fileID: 21300000, guid: 06eed7c796a1a40cdaee2a224a648531, type: 3}
- {fileID: 21300000, guid: 07e7c47f587414ecfa2292dc9e01c603, type: 3}
- {fileID: 21300000, guid: 6b8454e4afd554842af5e7109dd3d69d, type: 3}
- {fileID: 21300000, guid: 3c82b7790f4b7429c8a54b7372c62967, type: 3}
- {fileID: 21300000, guid: ac0d415c55cd04dc0b490cab9d7cff7c, type: 3}
- {fileID: 21300000, guid: 910341a9fbd884676b784550cb8de6dd, type: 3}
- {fileID: 21300000, guid: 185b2ac2d371f4fa8a0dcdd11d330138, type: 3}
- {fileID: 21300000, guid: 9348b49f4f02846ae8f67eff9928d970, type: 3}
- {fileID: 21300000, guid: c62d3e98e84cc44b3b23dbdafe7125a7, type: 3}
--- !u!114 &716226834
MonoBehaviour:
m_ObjectHideFlags: 0
......@@ -23695,19 +23695,8 @@ MonoBehaviour:
m_OnClick:
m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 2012954741}
m_MethodName: JumpWithDraw
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
- m_Target: {fileID: 1343088502}
m_MethodName: GetWithDrawPageInfo
- m_Target: {fileID: 716226833}
m_MethodName: clickWithDrawBg
m_Mode: 1
m_Arguments:
m_ObjectArgument: {fileID: 0}
......@@ -28645,7 +28634,7 @@ RectTransform:
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 20, y: 20}
m_Pivot: {x: 0.5, y: 0.5}
......@@ -44723,7 +44712,7 @@ RectTransform:
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: -240, y: -21}
m_AnchoredPosition: {x: -240, y: -27}
m_SizeDelta: {x: 130, y: 106}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1599538624
......@@ -46107,9 +46096,9 @@ RectTransform:
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: -17, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0, y: 1}
--- !u!114 &1645377759
MonoBehaviour:
Assets/Game/Main/Scripts/Model/WithDrawFirstInfoBean.cs
View file @ 17ea30ab
......@@ -6,4 +6,5 @@ public class WithDrawFirstInfoBean
{
public List<WithdrawListItem> wdlcWdDataList;
public bool isCanWd;
public int nextSeedPlantId;
}
Assets/Game/Main/Scripts/View/HomeInfoControl.cs
View file @ 17ea30ab
......@@ -543,11 +543,11 @@ public class HomeInfoControl : MonoBehaviour, HomeContract.View
AudioUtils.ins.PlayBtnAudio();
HttpTool.Instance._Post("app/v2/wdlc/seed_by_wd", null, new Action<OrderSeedData>((bean) =>
{
LandListInfo(bean.landList);
//LandListInfo(bean.landList);
// PlayerDataControl.Instance.VideoUnlockCarID = bean.lockNeedWatchVideoStartNum;
//Guide.guide.showGuide(bean.isNewUser);
//mView.LandListInfo(bean);
OnUpdateCarListData();
}), new Action<string, string>((code, errMsg) =>
{
Debug.unityLogger.Log("Get 请求失败" + code + errMsg);
......
Assets/Game/Main/Scripts/View/TitleControl.cs
View file @ 17ea30ab
......@@ -14,6 +14,8 @@ public class TitleControl : MonoBehaviour
public Image img_withdraw;
public GameObject contentParent, item_prefab;
public Text cashTitleDescTv;
public Image img_bottom_icon;
public Sprite[] lables;
//获取首页第一个提现信息
private void Start()
{
......@@ -37,6 +39,7 @@ public class TitleControl : MonoBehaviour
setNewData(bean.wdlcWdDataList);
//setData(bean.wdlcWdDataList);
setAnimal(bean);
setIcon(bean.nextSeedPlantId);
}), new Action<string, string>((code, errMsg) =>
{
......@@ -44,6 +47,11 @@ public class TitleControl : MonoBehaviour
}));
}
private void setIcon(int nextSeedPlantId)
{
img_bottom_icon.sprite = lables[nextSeedPlantId - 1];
}
private void setAnimal(WithDrawFirstInfoBean bean)
{
if (bean.isCanWd)
......
Assets/Game/Splash/resouse/组 1 拷贝.png.meta 0 → 100644
View file @ 17ea30ab
fileFormatVersion: 2
guid: 5db91ac454f5d4a039c95e89c6d46b62
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:
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