Commit 637017e0 authored by 王雪伟's avatar 王雪伟

幸福花园加入1.0.5需求马甲包Unity

parent d2bd5a4f
...@@ -116,7 +116,7 @@ MonoBehaviour: ...@@ -116,7 +116,7 @@ MonoBehaviour:
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
m_Material: {fileID: 0} m_Material: {fileID: 0}
m_Color: {r: 0.2627451, g: 0.49411765, b: 0.14509805, a: 1} m_Color: {r: 0.80784315, g: 0.42352942, b: 0.07450981, a: 1}
m_RaycastTarget: 1 m_RaycastTarget: 1
m_Maskable: 1 m_Maskable: 1
m_OnCullStateChanged: m_OnCullStateChanged:
...@@ -222,6 +222,7 @@ GameObject: ...@@ -222,6 +222,7 @@ GameObject:
- component: {fileID: 4820329151650945109} - component: {fileID: 4820329151650945109}
- component: {fileID: 3830571633674503303} - component: {fileID: 3830571633674503303}
- component: {fileID: 7830625092607302200} - component: {fileID: 7830625092607302200}
- component: {fileID: 4851421776959170195}
m_Layer: 5 m_Layer: 5
m_Name: receiver_btn m_Name: receiver_btn
m_TagString: Untagged m_TagString: Untagged
...@@ -339,6 +340,25 @@ MonoBehaviour: ...@@ -339,6 +340,25 @@ MonoBehaviour:
m_StringArgument: m_StringArgument:
m_BoolArgument: 0 m_BoolArgument: 0
m_CallState: 2 m_CallState: 2
--- !u!95 &4851421776959170195
Animator:
serializedVersion: 3
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6988976598671568271}
m_Enabled: 1
m_Avatar: {fileID: 0}
m_Controller: {fileID: 9100000, guid: c453ddf064153a840a0558b7748ff029, type: 2}
m_CullingMode: 0
m_UpdateMode: 0
m_ApplyRootMotion: 0
m_LinearVelocityBlending: 0
m_WarningMessage:
m_HasTransformHierarchy: 1
m_AllowConstantClipSamplingOptimization: 1
m_KeepAnimatorControllerStateOnDisable: 0
--- !u!1 &7618304266170614699 --- !u!1 &7618304266170614699
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
...@@ -397,7 +417,7 @@ MonoBehaviour: ...@@ -397,7 +417,7 @@ MonoBehaviour:
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
m_Material: {fileID: 0} m_Material: {fileID: 0}
m_Color: {r: 0.2627451, g: 0.49411765, b: 0.14509805, a: 1} m_Color: {r: 0.80784315, g: 0.42352942, b: 0.07450981, a: 1}
m_RaycastTarget: 1 m_RaycastTarget: 1
m_Maskable: 1 m_Maskable: 1
m_OnCullStateChanged: m_OnCullStateChanged:
......
...@@ -15160,7 +15160,7 @@ RectTransform: ...@@ -15160,7 +15160,7 @@ RectTransform:
m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 56, y: 66} m_SizeDelta: {x: 100, y: 100}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &559426349 --- !u!114 &559426349
MonoBehaviour: MonoBehaviour:
...@@ -17093,7 +17093,7 @@ RectTransform: ...@@ -17093,7 +17093,7 @@ RectTransform:
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}
m_AnchoredPosition: {x: 0, y: 610} m_AnchoredPosition: {x: 0, y: 627}
m_SizeDelta: {x: 750, y: 1334} m_SizeDelta: {x: 750, y: 1334}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &634203770 --- !u!222 &634203770
...@@ -62,7 +62,7 @@ public class TitleControl : MonoBehaviour ...@@ -62,7 +62,7 @@ public class TitleControl : MonoBehaviour
{ {
if (data.Count > 0) if (data.Count > 0)
{ {
withDrawTitleTv.text = data[0].conditionContent; withDrawTitleTv.text = data[0].shortConditionContent;
GetComponent<HomeItem>().setItemData(data[0]); GetComponent<HomeItem>().setItemData(data[0]);
} }
} }
......
...@@ -136,6 +136,8 @@ public class WithdrawalEveryDayControl : MonoBehaviour ...@@ -136,6 +136,8 @@ public class WithdrawalEveryDayControl : MonoBehaviour
} }
private int Onesid;
/// <summary> /// <summary>
/// 设置list数据 /// 设置list数据
/// </summary> /// </summary>
...@@ -148,6 +150,7 @@ public class WithdrawalEveryDayControl : MonoBehaviour ...@@ -148,6 +150,7 @@ public class WithdrawalEveryDayControl : MonoBehaviour
} }
for (int i = 0; i < taskList.Count; i++) for (int i = 0; i < taskList.Count; i++)
{ {
Onesid = taskList[0].sid;
GameObject game = Instantiate(itemObj, scroolViewContent.transform); GameObject game = Instantiate(itemObj, scroolViewContent.transform);
game.name = "" + i; game.name = "" + i;
game.GetComponent<WithdrawalEveryDayItemControl>().setDateInfo(taskList[i]); game.GetComponent<WithdrawalEveryDayItemControl>().setDateInfo(taskList[i]);
...@@ -248,6 +251,7 @@ public class WithdrawalEveryDayControl : MonoBehaviour ...@@ -248,6 +251,7 @@ public class WithdrawalEveryDayControl : MonoBehaviour
} }
else else
{ {
videoGetHeart(Onesid);
ToastPlugin.ToastHelper.ShowToast("进度未达到,快去增加进度吧!"); ToastPlugin.ToastHelper.ShowToast("进度未达到,快去增加进度吧!");
} }
} }
......
...@@ -13,8 +13,14 @@ public class WithdrawalEveryDayItemControl : MonoBehaviour ...@@ -13,8 +13,14 @@ public class WithdrawalEveryDayItemControl : MonoBehaviour
public Button receiver_btn;//btn public Button receiver_btn;//btn
public Text descript_tv;//描述 public Text descript_tv;//描述
public Sprite[] btnArraySprite; public Sprite[] btnArraySprite;
private Animator m_Animator;
private WithdrawalEverydayBean.TaskListItem taskItemDate; private WithdrawalEverydayBean.TaskListItem taskItemDate;
private void Awake()
{
m_Animator = receiver_btn.GetComponent<Animator>();
}
public void setDateInfo(WithdrawalEverydayBean.TaskListItem taskListItem) public void setDateInfo(WithdrawalEverydayBean.TaskListItem taskListItem)
{ {
this.taskItemDate = taskListItem; this.taskItemDate = taskListItem;
...@@ -23,9 +29,11 @@ public class WithdrawalEveryDayItemControl : MonoBehaviour ...@@ -23,9 +29,11 @@ public class WithdrawalEveryDayItemControl : MonoBehaviour
if (taskListItem.status == 1) if (taskListItem.status == 1)
{ {
receiver_btn.GetComponent<Image>().sprite = btnArraySprite[0]; receiver_btn.GetComponent<Image>().sprite = btnArraySprite[0];
m_Animator.Play("shake");
} }
else { else {
receiver_btn.GetComponent<Image>().sprite = btnArraySprite[1]; receiver_btn.GetComponent<Image>().sprite = btnArraySprite[1];
m_Animator.Play("stop");
} }
} }
......
...@@ -1493,7 +1493,7 @@ PrefabInstance: ...@@ -1493,7 +1493,7 @@ PrefabInstance:
- target: {fileID: 6886931802485600685, guid: 8263fb61881c37345be8525a90d1260a, - target: {fileID: 6886931802485600685, guid: 8263fb61881c37345be8525a90d1260a,
type: 3} type: 3}
propertyPath: m_IsActive propertyPath: m_IsActive
value: 1 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 6886931802851080946, guid: 8263fb61881c37345be8525a90d1260a, - target: {fileID: 6886931802851080946, guid: 8263fb61881c37345be8525a90d1260a,
type: 3} type: 3}
......
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