From 35aa79fbdfb87b2763d1c50bca3752fe5d1b97af Mon Sep 17 00:00:00 2001
From: wangguan <wangguan@kt007.com>
Date: Fri, 27 Nov 2020 11:22:07 +0800
Subject: [PATCH] 修改金币飞特效 修改新手引导 修改图片位置
---
Assets/Scripts/UI/FlyImage.cs | 35 ++-
Assets/Scripts/TowerDefense/Level/EndlessDropManager.cs | 11 +
Assets/UI/GuideUser/怪物来袭文字.png | 0
Assets/Scripts/TowerDefense/UI/DropCoinImage.cs | 2
Assets/Resources/UI/Guide/GuidePanel.prefab | 88 --------
Assets/UI/Endless/Bottom/Stop.png.meta | 118 +++++++++++
Assets/UI/Endless/Bottom/Stop.png | 0
Assets/Scripts/Guide/GuidePanel.cs | 2
Assets/Resources/UI/BuffPreview/BuffPreviewButton.prefab | 98 ---------
Assets/UI/GuideUser/怪物来袭文字.png.meta | 118 +++++++++++
Assets/Prefabs/UI/Endless/BottomCanvas.prefab | 62 ++++-
Assets/Scenes/Levels/Battle/Endless2D.unity | 13
12 files changed, 334 insertions(+), 213 deletions(-)
diff --git a/Assets/Prefabs/UI/Endless/BottomCanvas.prefab b/Assets/Prefabs/UI/Endless/BottomCanvas.prefab
index 9083b41..8acd079 100644
--- a/Assets/Prefabs/UI/Endless/BottomCanvas.prefab
+++ b/Assets/Prefabs/UI/Endless/BottomCanvas.prefab
@@ -547,8 +547,8 @@
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0.5}
m_AnchorMax: {x: 0, y: 0.5}
- m_AnchoredPosition: {x: 128.5, y: -13.125999}
- m_SizeDelta: {x: 102.997986, y: 66.25137}
+ m_AnchoredPosition: {x: 129.2, y: -13.125999}
+ m_SizeDelta: {x: 100, y: 66}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4623057511285327657
CanvasRenderer:
@@ -1676,9 +1676,9 @@
m_Father: {fileID: 2459412157512953547}
m_RootOrder: 6
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 1, y: 0}
- m_AnchorMax: {x: 1, y: 0}
- m_AnchoredPosition: {x: -151.5, y: 103}
+ m_AnchorMin: {x: 0, y: 0.5}
+ m_AnchorMax: {x: 0, y: 0.5}
+ m_AnchoredPosition: {x: 96.01, y: 620}
m_SizeDelta: {x: 95, y: 106}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4623057511951820394
@@ -6221,17 +6221,17 @@
- target: {fileID: 2366615777647505734, guid: edd0f54808263644d9740a9c0040b493,
type: 3}
propertyPath: m_AnchoredPosition.x
- value: 992
+ value: -88
objectReference: {fileID: 0}
- target: {fileID: 2366615777647505734, guid: edd0f54808263644d9740a9c0040b493,
type: 3}
propertyPath: m_AnchoredPosition.y
- value: 502
+ value: 600
objectReference: {fileID: 0}
- target: {fileID: 2366615777647505734, guid: edd0f54808263644d9740a9c0040b493,
type: 3}
propertyPath: m_SizeDelta.x
- value: 248.79999
+ value: 248.80005
objectReference: {fileID: 0}
- target: {fileID: 2366615777647505734, guid: edd0f54808263644d9740a9c0040b493,
type: 3}
@@ -6241,7 +6241,7 @@
- target: {fileID: 2366615777647505734, guid: edd0f54808263644d9740a9c0040b493,
type: 3}
propertyPath: m_AnchorMin.x
- value: 0
+ value: 1
objectReference: {fileID: 0}
- target: {fileID: 2366615777647505734, guid: edd0f54808263644d9740a9c0040b493,
type: 3}
@@ -6251,7 +6251,7 @@
- target: {fileID: 2366615777647505734, guid: edd0f54808263644d9740a9c0040b493,
type: 3}
propertyPath: m_AnchorMax.x
- value: 0
+ value: 1
objectReference: {fileID: 0}
- target: {fileID: 2366615777647505734, guid: edd0f54808263644d9740a9c0040b493,
type: 3}
@@ -7155,6 +7155,22 @@
m_Modification:
m_TransformParent: {fileID: 2459412157512953547}
m_Modifications:
+ - target: {fileID: 162820265451914912, guid: 4770a823e47024d4a80a36e9ed6641eb,
+ type: 3}
+ propertyPath: m_SizeDelta.x
+ value: 95
+ objectReference: {fileID: 0}
+ - target: {fileID: 162820265451914912, guid: 4770a823e47024d4a80a36e9ed6641eb,
+ type: 3}
+ propertyPath: m_SizeDelta.y
+ value: 106
+ objectReference: {fileID: 0}
+ - target: {fileID: 162820265451914913, guid: 4770a823e47024d4a80a36e9ed6641eb,
+ type: 3}
+ propertyPath: m_Sprite
+ value:
+ objectReference: {fileID: 21300000, guid: 0175a28979288104488ee8605b742919,
+ type: 3}
- target: {fileID: 162820265451914915, guid: 4770a823e47024d4a80a36e9ed6641eb,
type: 3}
propertyPath: Panel
@@ -7238,7 +7254,7 @@
- target: {fileID: 162820266587863501, guid: 4770a823e47024d4a80a36e9ed6641eb,
type: 3}
propertyPath: m_AnchoredPosition.x
- value: -446
+ value: 94
objectReference: {fileID: 0}
- target: {fileID: 162820266587863501, guid: 4770a823e47024d4a80a36e9ed6641eb,
type: 3}
@@ -7258,7 +7274,7 @@
- target: {fileID: 162820266587863501, guid: 4770a823e47024d4a80a36e9ed6641eb,
type: 3}
propertyPath: m_AnchorMin.x
- value: 0.5
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 162820266587863501, guid: 4770a823e47024d4a80a36e9ed6641eb,
type: 3}
@@ -7268,7 +7284,7 @@
- target: {fileID: 162820266587863501, guid: 4770a823e47024d4a80a36e9ed6641eb,
type: 3}
propertyPath: m_AnchorMax.x
- value: 0.5
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 162820266587863501, guid: 4770a823e47024d4a80a36e9ed6641eb,
type: 3}
@@ -7637,6 +7653,26 @@
propertyPath: m_Pivot.y
value: 0.5
objectReference: {fileID: 0}
+ - target: {fileID: 2245660995521503250, guid: a79d1f3a15bc38649995cdefa8c1899b,
+ type: 3}
+ propertyPath: m_AnchoredPosition.y
+ value: 302.4
+ objectReference: {fileID: 0}
+ - target: {fileID: 2245660995521503250, guid: a79d1f3a15bc38649995cdefa8c1899b,
+ type: 3}
+ propertyPath: m_AnchorMin.x
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 2245660995521503250, guid: a79d1f3a15bc38649995cdefa8c1899b,
+ type: 3}
+ propertyPath: m_AnchorMax.x
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 2245660995521503250, guid: a79d1f3a15bc38649995cdefa8c1899b,
+ type: 3}
+ propertyPath: m_AnchoredPosition.x
+ value: -81
+ objectReference: {fileID: 0}
- target: {fileID: 5246606145602305252, guid: a79d1f3a15bc38649995cdefa8c1899b,
type: 3}
propertyPath: m_Name
diff --git a/Assets/Resources/UI/BuffPreview/BuffPreviewButton.prefab b/Assets/Resources/UI/BuffPreview/BuffPreviewButton.prefab
index 3c7dd8b..bfe4bbe 100644
--- a/Assets/Resources/UI/BuffPreview/BuffPreviewButton.prefab
+++ b/Assets/Resources/UI/BuffPreview/BuffPreviewButton.prefab
@@ -1,102 +1,5 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
---- !u!1 &162820265406514350
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 162820265406514351}
- - component: {fileID: 162820265406514346}
- - component: {fileID: 162820265406514345}
- - component: {fileID: 162820265406514344}
- m_Layer: 5
- m_Name: Text
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!224 &162820265406514351
-RectTransform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 162820265406514350}
- 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: 162820266587863501}
- m_RootOrder: 1
- 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: 40.6, y: -68.43}
- m_SizeDelta: {x: 160, y: 37.097298}
- m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &162820265406514346
-CanvasRenderer:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 162820265406514350}
- m_CullTransparentMesh: 0
---- !u!114 &162820265406514345
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 162820265406514350}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- m_Material: {fileID: 0}
- m_Color: {r: 1, g: 1, b: 1, a: 1}
- m_RaycastTarget: 1
- m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
- m_Maskable: 1
- m_OnCullStateChanged:
- m_PersistentCalls:
- m_Calls: []
- m_FontData:
- m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
- m_FontSize: 30
- m_FontStyle: 1
- m_BestFit: 0
- m_MinSize: 3
- m_MaxSize: 300
- m_Alignment: 0
- m_AlignByGeometry: 0
- m_RichText: 1
- m_HorizontalOverflow: 0
- m_VerticalOverflow: 0
- m_LineSpacing: 1
- m_Text: 'BUFF
-
-'
---- !u!114 &162820265406514344
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 162820265406514350}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: e19747de3f5aca642ab2be37e372fb86, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- m_EffectColor: {r: 0, g: 0, b: 0, a: 0.5}
- m_EffectDistance: {x: 2.9, y: -1.48}
- m_UseGraphicAlpha: 1
--- !u!1 &162820265451914919
GameObject:
m_ObjectHideFlags: 0
@@ -261,7 +164,6 @@
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 162820265451914912}
- - {fileID: 162820265406514351}
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
diff --git a/Assets/Resources/UI/Guide/GuidePanel.prefab b/Assets/Resources/UI/Guide/GuidePanel.prefab
index 5c8a979..520d596 100644
--- a/Assets/Resources/UI/Guide/GuidePanel.prefab
+++ b/Assets/Resources/UI/Guide/GuidePanel.prefab
@@ -10813,85 +10813,6 @@
m_Script: {fileID: 11500000, guid: b853ac60c2d385d4dbc98c0d558451bb, type: 3}
m_Name:
m_EditorClassIdentifier:
---- !u!1 &4194100260256678997
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 3729847023059857890}
- - component: {fileID: 420363371752327425}
- - component: {fileID: 4803840975682259644}
- m_Layer: 5
- m_Name: Text
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!224 &3729847023059857890
-RectTransform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 4194100260256678997}
- 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: 5284319985334853514}
- m_RootOrder: 0
- m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0, y: 0}
- m_AnchorMax: {x: 1, y: 1}
- m_AnchoredPosition: {x: 0, y: 0}
- m_SizeDelta: {x: 0, y: 0}
- m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &420363371752327425
-CanvasRenderer:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 4194100260256678997}
- m_CullTransparentMesh: 0
---- !u!114 &4803840975682259644
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 4194100260256678997}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- m_Material: {fileID: 0}
- m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
- m_RaycastTarget: 1
- m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
- m_Maskable: 1
- m_OnCullStateChanged:
- m_PersistentCalls:
- m_Calls: []
- m_FontData:
- m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
- m_FontSize: 50
- m_FontStyle: 0
- m_BestFit: 0
- m_MinSize: 3
- m_MaxSize: 50
- m_Alignment: 4
- m_AlignByGeometry: 0
- m_RichText: 1
- m_HorizontalOverflow: 0
- m_VerticalOverflow: 0
- m_LineSpacing: 1
- m_Text: "\u5927\u6CE2\u654C\u4EBA\u6765\u88AD"
--- !u!1 &4283419727313149636
GameObject:
m_ObjectHideFlags: 0
@@ -16964,15 +16885,14 @@
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: 3729847023059857890}
+ m_Children: []
m_Father: {fileID: 5529930024907350475}
m_RootOrder: 13
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: 700, y: 300}
+ m_AnchoredPosition: {x: 0, y: 400}
+ m_SizeDelta: {x: 715, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3706244911713911788
CanvasRenderer:
@@ -17002,7 +16922,7 @@
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
- m_Sprite: {fileID: 0}
+ m_Sprite: {fileID: 21300000, guid: 7b876b1fef6d8124297c32ddb61f5fc3, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
diff --git a/Assets/Scenes/Levels/Battle/Endless2D.unity b/Assets/Scenes/Levels/Battle/Endless2D.unity
index 98d6793..591163b 100644
--- a/Assets/Scenes/Levels/Battle/Endless2D.unity
+++ b/Assets/Scenes/Levels/Battle/Endless2D.unity
@@ -4080,6 +4080,11 @@
m_Modification:
m_TransformParent: {fileID: 1340671931}
m_Modifications:
+ - target: {fileID: 4623057511951820392, guid: 29da21b318f42054db30c52123aa4dbf,
+ type: 3}
+ propertyPath: m_AnchoredPosition.x
+ value: 96.01001
+ objectReference: {fileID: 0}
- target: {fileID: 4623057512704841786, guid: 29da21b318f42054db30c52123aa4dbf,
type: 3}
propertyPath: m_Name
@@ -10634,12 +10639,12 @@
- target: {fileID: 1671498435182872929, guid: dcbcc0c51f9291c498c66e05663360e2,
type: 3}
propertyPath: m_AnchoredPosition.x
- value: -446
+ value: 94
objectReference: {fileID: 0}
- target: {fileID: 1671498435182872929, guid: dcbcc0c51f9291c498c66e05663360e2,
type: 3}
propertyPath: m_AnchoredPosition.y
- value: 647
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 1671498435182872929, guid: dcbcc0c51f9291c498c66e05663360e2,
type: 3}
@@ -10654,7 +10659,7 @@
- target: {fileID: 1671498435182872929, guid: dcbcc0c51f9291c498c66e05663360e2,
type: 3}
propertyPath: m_AnchorMin.x
- value: 0.5
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 1671498435182872929, guid: dcbcc0c51f9291c498c66e05663360e2,
type: 3}
@@ -10664,7 +10669,7 @@
- target: {fileID: 1671498435182872929, guid: dcbcc0c51f9291c498c66e05663360e2,
type: 3}
propertyPath: m_AnchorMax.x
- value: 0.5
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 1671498435182872929, guid: dcbcc0c51f9291c498c66e05663360e2,
type: 3}
diff --git a/Assets/Scripts/Guide/GuidePanel.cs b/Assets/Scripts/Guide/GuidePanel.cs
index 7d770e5..61982db 100644
--- a/Assets/Scripts/Guide/GuidePanel.cs
+++ b/Assets/Scripts/Guide/GuidePanel.cs
@@ -52,7 +52,7 @@
RectTransform dragHandImg;//拖动标识手指
Button skillBtn;//
- Vector2 skillBtnPos = new Vector2(455, -150);
+ Vector2 skillBtnPos = new Vector2(459, 112);
private Image warningImg;//大波敌人来袭提示
/// <summary>
diff --git a/Assets/Scripts/TowerDefense/Level/EndlessDropManager.cs b/Assets/Scripts/TowerDefense/Level/EndlessDropManager.cs
index 1b51014..7ea8bf3 100644
--- a/Assets/Scripts/TowerDefense/Level/EndlessDropManager.cs
+++ b/Assets/Scripts/TowerDefense/Level/EndlessDropManager.cs
@@ -216,9 +216,18 @@
// yield return new WaitForSeconds(0.2f);
- for (int i = 0; i < count; i++)
+ for (int i = 0; i < 15; i++)
{
fly = CreateIcon(ts);
+ if (i == 0)
+ {
+ fly.Init(true, count);
+ }
+ else
+ {
+ fly.Init(false, 0);
+ }
+
fly.SetDestination(sp, startP, endP, useBezier);
yield return new WaitForSeconds(0.01f);
diff --git a/Assets/Scripts/TowerDefense/UI/DropCoinImage.cs b/Assets/Scripts/TowerDefense/UI/DropCoinImage.cs
index 3c9ed80..bcfdf82 100644
--- a/Assets/Scripts/TowerDefense/UI/DropCoinImage.cs
+++ b/Assets/Scripts/TowerDefense/UI/DropCoinImage.cs
@@ -47,7 +47,7 @@
private void StartFly()
{
tmpBtn.interactable = false;
- RectTransform end = GameObject.Find("UICamera/MainUI/FlyEndPos").GetComponent<RectTransform>();
+ Transform end = GameObject.Find("UICamera/MainUI/FlyEndPos").transform;
//金币飞动 增加多少个金币，制造多少个
TowerDefense.Level.EndlessDropManager.instance.FlyIcon(
transform.parent,
diff --git a/Assets/Scripts/UI/FlyImage.cs b/Assets/Scripts/UI/FlyImage.cs
index 4f5a5d0..9bf81ea 100644
--- a/Assets/Scripts/UI/FlyImage.cs
+++ b/Assets/Scripts/UI/FlyImage.cs
@@ -1,4 +1,5 @@
-using System.Collections.Generic;
+using System.Security.AccessControl;
+using System.Collections.Generic;
using DG.Tweening;
using KTGMGemClient;
using TowerDefense.Level;
@@ -27,6 +28,13 @@
ts = transform.GetComponent<RectTransform>();
}
private Image tmpImage;
+ private bool isBroadCast;
+ private int tmpCurrency;
+ public void Init(bool isBC, int currency)
+ {
+ isBroadCast = isBC;
+ tmpCurrency = currency;
+ }
/// <summary>
/// 设置终点
/// </summary>
@@ -59,28 +67,29 @@
}
}
- bool isUp;
+ bool isLeft;
private Vector3 RandomPos()
{
Vector3 tmpV = Vector3.zero;
- tmpV.x -= UnityEngine.Random.Range(10, 20);
+ tmpV.y += UnityEngine.Random.Range(30, 50);
int a = UnityEngine.Random.Range(-20, 20);
- isUp = a > 0;
- tmpV.z += a;
+ isLeft = a > 0;
+ tmpV.x += a;
return tmpV;
}
private Vector3 GetOffect()
{
Vector3 tmpV = Vector3.zero;
- tmpV.x -= UnityEngine.Random.Range(10, 15);
- if (isUp)
+ if (isLeft)
{
- tmpV.z += UnityEngine.Random.Range(10, 20);
+ tmpV.x -= UnityEngine.Random.Range(80, 150);
+ tmpV.y += UnityEngine.Random.Range(500, 600);
}
else
{
- tmpV.z -= UnityEngine.Random.Range(10, 20);
+ tmpV.x += UnityEngine.Random.Range(500, 600);
+ tmpV.y += UnityEngine.Random.Range(80, 150);
}
return tmpV;
@@ -111,8 +120,12 @@
gameObject.SetActive(false);
- EndlessLevelManager.instance.Currency.AddCurrency(1);//每个金币增加1
- EventCenter.Ins.BroadCast((int)KTGMGemClient.EventType.PlayGetGoldPS);
+ if (isBroadCast)
+ {
+ EndlessLevelManager.instance.Currency.AddCurrency(tmpCurrency);
+ EventCenter.Ins.BroadCast((int)KTGMGemClient.EventType.PlayGetGoldPS);
+ }
+
//Core.Utilities.Poolable.TryPool(gameObject);
}
diff --git a/Assets/UI/Endless/Bottom/Stop.png b/Assets/UI/Endless/Bottom/Stop.png
new file mode 100644
index 0000000..c43220c
--- /dev/null
+++ b/Assets/UI/Endless/Bottom/Stop.png
Binary files differ
diff --git a/Assets/UI/Endless/Bottom/Stop.png.meta b/Assets/UI/Endless/Bottom/Stop.png.meta
new file mode 100644
index 0000000..c692a35
--- /dev/null
+++ b/Assets/UI/Endless/Bottom/Stop.png.meta
@@ -0,0 +1,118 @@
+fileFormatVersion: 2
+guid: 0175a28979288104488ee8605b742919
+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
+ vTOnly: 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
+ ignorePngGamma: 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
+ - serializedVersion: 3
+ buildTarget: Standalone
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
+ - serializedVersion: 3
+ buildTarget: Android
+ 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:
diff --git "a/Assets/UI/GuideUser/\346\200\252\347\211\251\346\235\245\350\242\255\346\226\207\345\255\227.png" "b/Assets/UI/GuideUser/\346\200\252\347\211\251\346\235\245\350\242\255\346\226\207\345\255\227.png"
new file mode 100644
index 0000000..8d2dc52
--- /dev/null
+++ "b/Assets/UI/GuideUser/\346\200\252\347\211\251\346\235\245\350\242\255\346\226\207\345\255\227.png"
Binary files differ
diff --git "a/Assets/UI/GuideUser/\346\200\252\347\211\251\346\235\245\350\242\255\346\226\207\345\255\227.png.meta" "b/Assets/UI/GuideUser/\346\200\252\347\211\251\346\235\245\350\242\255\346\226\207\345\255\227.png.meta"
new file mode 100644
index 0000000..08a6a11
--- /dev/null
+++ "b/Assets/UI/GuideUser/\346\200\252\347\211\251\346\235\245\350\242\255\346\226\207\345\255\227.png.meta"
@@ -0,0 +1,118 @@
+fileFormatVersion: 2
+guid: 7b876b1fef6d8124297c32ddb61f5fc3
+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
+ vTOnly: 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
+ ignorePngGamma: 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
+ - serializedVersion: 3
+ buildTarget: Standalone
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
+ - serializedVersion: 3
+ buildTarget: Android
+ 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:
--
Gitblit v1.9.1