From 3da3d10bfdd30a1ad7f8c48ab9fd7e7745e3d053 Mon Sep 17 00:00:00 2001
From: wangguan <wangguan@kt007.com>
Date: Tue, 17 Nov 2020 20:55:15 +0800
Subject: [PATCH] 修改特效层级 修改金币BUG
---
Assets/Scripts/GameAnalytics_SDK/UI/LoginUI.cs | 1
Assets/Materials/UI/tileTowerVSMat.mat | 2
Assets/Prefabs/Enemies/fire 2.prefab | 5
Assets/00000/package/Prefab/Effect_XinSui.prefab | 12 +-
Assets/Scripts/TowerDefense/Towers/Placement/TowerPlacementGridEndless.cs | 2
Assets/Scripts/UI/FinalPanel/FinalPanel.cs | 2
Assets/Scenes/Levels/Battle/Endless2D.unity | 49 +++++----
Assets/00000/package/Prefab/Effect_shengli.prefab | 18 +-
Assets/Resources/UI/Final/FinalPanel.prefab | 172 ++++++++++++++++++++++++++++++++--
9 files changed, 212 insertions(+), 51 deletions(-)
diff --git a/Assets/00000/package/Prefab/Effect_XinSui.prefab b/Assets/00000/package/Prefab/Effect_XinSui.prefab
index eb1a21f..3db1317 100644
--- a/Assets/00000/package/Prefab/Effect_XinSui.prefab
+++ b/Assets/00000/package/Prefab/Effect_XinSui.prefab
@@ -11,7 +11,7 @@
- component: {fileID: 3389300521755215606}
- component: {fileID: 3389300521755215604}
- component: {fileID: 3389300521755215607}
- m_Layer: 0
+ m_Layer: 5
m_Name: Particle System
m_TagString: Untagged
m_Icon: {fileID: 0}
@@ -4881,7 +4881,7 @@
- component: {fileID: 3389300522021803451}
- component: {fileID: 3389300522021803449}
- component: {fileID: 3389300522021803448}
- m_Layer: 0
+ m_Layer: 5
m_Name: 01 (11)
m_TagString: Untagged
m_Icon: {fileID: 0}
@@ -9751,7 +9751,7 @@
- component: {fileID: 3389300522131408961}
- component: {fileID: 3389300522131408991}
- component: {fileID: 3389300522131408990}
- m_Layer: 0
+ m_Layer: 5
m_Name: Particle System (1)
m_TagString: Untagged
m_Icon: {fileID: 0}
@@ -14652,7 +14652,7 @@
- component: {fileID: 3389300522798179398}
- component: {fileID: 3389300522798179396}
- component: {fileID: 3389300522798179399}
- m_Layer: 0
+ m_Layer: 5
m_Name: Particle System (2)
m_TagString: Untagged
m_Icon: {fileID: 0}
@@ -19522,7 +19522,7 @@
- component: {fileID: 3389300522800260023}
- component: {fileID: 3389300522800260021}
- component: {fileID: 3389300522800260020}
- m_Layer: 0
+ m_Layer: 5
m_Name: 01 (12)
m_TagString: Untagged
m_Icon: {fileID: 0}
@@ -24390,7 +24390,7 @@
serializedVersion: 6
m_Component:
- component: {fileID: 3389300523282741961}
- m_Layer: 0
+ m_Layer: 5
m_Name: Effect_XinSui
m_TagString: Untagged
m_Icon: {fileID: 0}
diff --git a/Assets/00000/package/Prefab/Effect_shengli.prefab b/Assets/00000/package/Prefab/Effect_shengli.prefab
index cd53742..c7d9c4e 100644
--- a/Assets/00000/package/Prefab/Effect_shengli.prefab
+++ b/Assets/00000/package/Prefab/Effect_shengli.prefab
@@ -11,7 +11,7 @@
- component: {fileID: 6134855058916476456}
- component: {fileID: 5469027015209105454}
- component: {fileID: 5940682838526549809}
- m_Layer: 0
+ m_Layer: 5
m_Name: 01 (8)
m_TagString: Untagged
m_Icon: {fileID: 0}
@@ -4832,7 +4832,7 @@
- component: {fileID: 2765268900554931416}
- component: {fileID: 5432507131470581521}
- component: {fileID: 3780837202313213196}
- m_Layer: 0
+ m_Layer: 5
m_Name: 01 (4)
m_TagString: Untagged
m_Icon: {fileID: 0}
@@ -9653,7 +9653,7 @@
- component: {fileID: 5317580758673134019}
- component: {fileID: 1455604214335079816}
- component: {fileID: 3954602241887578847}
- m_Layer: 0
+ m_Layer: 5
m_Name: 03
m_TagString: Untagged
m_Icon: {fileID: 0}
@@ -14449,7 +14449,7 @@
- component: {fileID: 8490939905960748792}
- component: {fileID: 8196034520942807496}
- component: {fileID: 3579094376539017972}
- m_Layer: 0
+ m_Layer: 5
m_Name: 01 (5)
m_TagString: Untagged
m_Icon: {fileID: 0}
@@ -19270,7 +19270,7 @@
- component: {fileID: 7913227422217292007}
- component: {fileID: 7947575155728946589}
- component: {fileID: 1744324721440986758}
- m_Layer: 0
+ m_Layer: 5
m_Name: 01 (7)
m_TagString: Untagged
m_Icon: {fileID: 0}
@@ -24091,7 +24091,7 @@
- component: {fileID: 4756578894029972224}
- component: {fileID: 3862226665486660374}
- component: {fileID: 2455321870183315354}
- m_Layer: 0
+ m_Layer: 5
m_Name: Particle System
m_TagString: Untagged
m_Icon: {fileID: 0}
@@ -28959,7 +28959,7 @@
serializedVersion: 6
m_Component:
- component: {fileID: 5990523350250741298}
- m_Layer: 0
+ m_Layer: 5
m_Name: Effect_shengli
m_TagString: Untagged
m_Icon: {fileID: 0}
@@ -28992,7 +28992,7 @@
- component: {fileID: 8569552636583077347}
- component: {fileID: 9094963163366249932}
- component: {fileID: 5373371773647211876}
- m_Layer: 0
+ m_Layer: 5
m_Name: 01 (6)
m_TagString: Untagged
m_Icon: {fileID: 0}
@@ -33813,7 +33813,7 @@
- component: {fileID: 4867893894597803980}
- component: {fileID: 926994943734493100}
- component: {fileID: 6557639901936376588}
- m_Layer: 0
+ m_Layer: 5
m_Name: 03 (1)
m_TagString: Untagged
m_Icon: {fileID: 0}
diff --git a/Assets/Materials/UI/tileTowerVSMat.mat b/Assets/Materials/UI/tileTowerVSMat.mat
index 29c24ee..48d981d 100644
--- a/Assets/Materials/UI/tileTowerVSMat.mat
+++ b/Assets/Materials/UI/tileTowerVSMat.mat
@@ -40,7 +40,7 @@
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MainTex:
- m_Texture: {fileID: 2800000, guid: 93f40a01d57fbff418fc0b54b6ab7d9f, type: 3}
+ m_Texture: {fileID: 2800000, guid: 8c9a3d26120e78f40aa4ef9ed23d573c, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MetallicGlossMap:
diff --git a/Assets/Prefabs/Enemies/fire 2.prefab b/Assets/Prefabs/Enemies/fire 2.prefab
index 8a929fa..b3d7daa 100644
--- a/Assets/Prefabs/Enemies/fire 2.prefab
+++ b/Assets/Prefabs/Enemies/fire 2.prefab
@@ -96,6 +96,7 @@
m_Script: {fileID: 11500000, guid: 70719dcea2b0be54580a41e62debeab1, type: 3}
m_Name:
m_EditorClassIdentifier:
+ offect: {x: 0, y: 0.07, z: 0.04}
--- !u!95 &8418524101809364958
Animator:
serializedVersion: 3
@@ -313,6 +314,7 @@
m_EditorClassIdentifier:
description:
projectile: {fileID: 0}
+ woodProjectile_SP: {fileID: 0}
projectilePoints: []
epicenter: {fileID: 8434816861478773449}
isMultiAttack: 0
@@ -322,6 +324,7 @@
randomAudioSource: {fileID: 0}
towerTargetter: {fileID: 7490226013430720439}
radiusEffectColor: {r: 0, g: 0, b: 0, a: 0}
+ towerLevel: {fileID: 0}
--- !u!114 &8434816861478773454
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -1176,7 +1179,7 @@
- target: {fileID: 2639904807578598379, guid: 78046dd80a5fb1d45a60cf15574ee7bf,
type: 3}
propertyPath: m_RootOrder
- value: 9
+ value: 10
objectReference: {fileID: 0}
- target: {fileID: 2639904807578598379, guid: 78046dd80a5fb1d45a60cf15574ee7bf,
type: 3}
diff --git a/Assets/Resources/UI/Final/FinalPanel.prefab b/Assets/Resources/UI/Final/FinalPanel.prefab
index 74ccd26..602cd55 100644
--- a/Assets/Resources/UI/Final/FinalPanel.prefab
+++ b/Assets/Resources/UI/Final/FinalPanel.prefab
@@ -70,7 +70,7 @@
m_Children:
- {fileID: 332274925}
m_Father: {fileID: 5825945650563712391}
- m_RootOrder: 7
+ m_RootOrder: 9
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 1}
m_AnchorMax: {x: 0.5, y: 1}
@@ -229,6 +229,8 @@
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
+ - {fileID: 1988947377937968563}
+ - {fileID: 5748941952564637225}
- {fileID: 5646961902762380150}
- {fileID: 4943816522755542425}
- {fileID: 1818325968707775638}
@@ -266,14 +268,14 @@
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
- m_Color: {r: 0, g: 0, b: 0, a: 0.6}
+ 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_Sprite: {fileID: 0}
+ m_Sprite: {fileID: 21300000, guid: e956ec24a18e6674b8987899c8901174, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@@ -336,7 +338,7 @@
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 5825945650563712391}
- m_RootOrder: 3
+ m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 1}
m_AnchorMax: {x: 0.5, y: 1}
@@ -415,7 +417,7 @@
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 5825945650563712391}
- m_RootOrder: 6
+ m_RootOrder: 8
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0}
m_AnchorMax: {x: 0.5, y: 0}
@@ -630,7 +632,7 @@
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 5825945650563712391}
- m_RootOrder: 0
+ m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
@@ -748,7 +750,7 @@
- {fileID: 6820271757256221080}
- {fileID: 197643528144310344}
m_Father: {fileID: 5825945650563712391}
- m_RootOrder: 1
+ m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
@@ -834,6 +836,81 @@
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: "\u6211\u7684\u6700\u9AD8\u5206"
+--- !u!1 &6098437046537043861
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 1988947377937968563}
+ - component: {fileID: 8505110228154102131}
+ - component: {fileID: 1059051821504230421}
+ m_Layer: 5
+ m_Name: Image (1)
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &1988947377937968563
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 6098437046537043861}
+ 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: 5825945650563712391}
+ m_RootOrder: 0
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0, y: 0}
+ m_AnchorMax: {x: 1, y: 0}
+ m_AnchoredPosition: {x: 0, y: -250}
+ m_SizeDelta: {x: 0, y: 500}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &8505110228154102131
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 6098437046537043861}
+ m_CullTransparentMesh: 0
+--- !u!114 &1059051821504230421
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 6098437046537043861}
+ 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_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+ m_Maskable: 1
+ m_OnCullStateChanged:
+ m_PersistentCalls:
+ m_Calls: []
+ m_Sprite: {fileID: 21300000, guid: e956ec24a18e6674b8987899c8901174, 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 &6819379700565871762
GameObject:
m_ObjectHideFlags: 0
@@ -939,7 +1016,7 @@
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 5825945650563712391}
- m_RootOrder: 2
+ m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 1}
m_AnchorMax: {x: 0.5, y: 1}
@@ -1014,7 +1091,7 @@
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 5825945650563712391}
- m_RootOrder: 4
+ m_RootOrder: 6
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 1}
m_AnchorMax: {x: 0.5, y: 1}
@@ -1063,6 +1140,81 @@
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: 789220
+--- !u!1 &8360541287418413787
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 5748941952564637225}
+ - component: {fileID: 7265106792194721657}
+ - component: {fileID: 2994887600340966553}
+ m_Layer: 5
+ m_Name: Image
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &5748941952564637225
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 8360541287418413787}
+ 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: 5825945650563712391}
+ m_RootOrder: 1
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0, y: 1}
+ m_AnchorMax: {x: 1, y: 1}
+ m_AnchoredPosition: {x: 0, y: 250}
+ m_SizeDelta: {x: 0, y: 500}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &7265106792194721657
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 8360541287418413787}
+ m_CullTransparentMesh: 0
+--- !u!114 &2994887600340966553
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 8360541287418413787}
+ 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_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+ m_Maskable: 1
+ m_OnCullStateChanged:
+ m_PersistentCalls:
+ m_Calls: []
+ m_Sprite: {fileID: 21300000, guid: e956ec24a18e6674b8987899c8901174, 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 &8519968415981260941
GameObject:
m_ObjectHideFlags: 0
@@ -1170,7 +1322,7 @@
- {fileID: 8214016810444386803}
- {fileID: 2909423727142955745}
m_Father: {fileID: 5825945650563712391}
- m_RootOrder: 5
+ m_RootOrder: 7
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0}
m_AnchorMax: {x: 0.5, y: 0}
diff --git a/Assets/Scenes/Levels/Battle/Endless2D.unity b/Assets/Scenes/Levels/Battle/Endless2D.unity
index ac3492d..bd5bf7e 100644
--- a/Assets/Scenes/Levels/Battle/Endless2D.unity
+++ b/Assets/Scenes/Levels/Battle/Endless2D.unity
@@ -1154,8 +1154,8 @@
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 167919691}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
- m_LocalPosition: {x: 20.6, y: 0.98, z: 7.24}
- m_LocalScale: {x: 0.79999995, y: 1, z: 3.3}
+ m_LocalPosition: {x: 20.6, y: 0.98, z: 9.84}
+ m_LocalScale: {x: 0.79999995, y: 1, z: 3.82}
m_Children:
- {fileID: 533867356}
m_Father: {fileID: 304173789}
@@ -2374,8 +2374,8 @@
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 495435993}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
- m_LocalPosition: {x: -20.46, y: 0.9, z: 7.24}
- m_LocalScale: {x: 0.79999995, y: 1, z: 3.3}
+ m_LocalPosition: {x: -20.46, y: 0.9, z: 9.84}
+ m_LocalScale: {x: 0.79999995, y: 1, z: 3.82}
m_Children:
- {fileID: 1190267569}
m_Father: {fileID: 304173789}
@@ -2507,7 +2507,7 @@
- target: {fileID: 557383556243119057, guid: 5ac231bd690a7c94c922e705e97b4f63,
type: 3}
propertyPath: m_LocalPosition.z
- value: -3.1300006
+ value: -3.1300004
objectReference: {fileID: 0}
- target: {fileID: 557383556243119057, guid: 5ac231bd690a7c94c922e705e97b4f63,
type: 3}
@@ -2552,7 +2552,7 @@
- target: {fileID: 557383556243119057, guid: 5ac231bd690a7c94c922e705e97b4f63,
type: 3}
propertyPath: m_LocalScale.z
- value: 0.5
+ value: 0.32
objectReference: {fileID: 0}
- target: {fileID: 557383556243119058, guid: 5ac231bd690a7c94c922e705e97b4f63,
type: 3}
@@ -2981,8 +2981,8 @@
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 618377762}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
- m_LocalPosition: {x: 10.42, y: 0.98, z: 7.24}
- m_LocalScale: {x: 0.79999995, y: 1, z: 3.3}
+ m_LocalPosition: {x: 10.42, y: 0.98, z: 9.84}
+ m_LocalScale: {x: 0.79999995, y: 1, z: 3.82}
m_Children:
- {fileID: 1012428775}
m_Father: {fileID: 304173789}
@@ -4077,6 +4077,11 @@
propertyPath: m_AnchoredPosition.y
value: -0.0007324219
objectReference: {fileID: 0}
+ - target: {fileID: 4623057512702542564, guid: 29da21b318f42054db30c52123aa4dbf,
+ type: 3}
+ propertyPath: m_IsActive
+ value: 1
+ objectReference: {fileID: 0}
- target: {fileID: 4623057512704841786, guid: 29da21b318f42054db30c52123aa4dbf,
type: 3}
propertyPath: m_Name
@@ -4804,7 +4809,7 @@
- target: {fileID: 557383556243119057, guid: 5ac231bd690a7c94c922e705e97b4f63,
type: 3}
propertyPath: m_LocalPosition.z
- value: -3.1300006
+ value: -3.1300004
objectReference: {fileID: 0}
- target: {fileID: 557383556243119057, guid: 5ac231bd690a7c94c922e705e97b4f63,
type: 3}
@@ -4849,7 +4854,7 @@
- target: {fileID: 557383556243119057, guid: 5ac231bd690a7c94c922e705e97b4f63,
type: 3}
propertyPath: m_LocalScale.z
- value: 0.5
+ value: 0.32
objectReference: {fileID: 0}
- target: {fileID: 557383556243119058, guid: 5ac231bd690a7c94c922e705e97b4f63,
type: 3}
@@ -5549,8 +5554,8 @@
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1172845526}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
- m_LocalPosition: {x: -10.08, y: 0.98, z: 7.24}
- m_LocalScale: {x: 0.79999995, y: 1, z: 3.3}
+ m_LocalPosition: {x: -10.08, y: 0.98, z: 9.84}
+ m_LocalScale: {x: 0.79999995, y: 1, z: 3.82}
m_Children:
- {fileID: 1984458564}
m_Father: {fileID: 304173789}
@@ -8192,7 +8197,7 @@
- target: {fileID: 557383556243119057, guid: 5ac231bd690a7c94c922e705e97b4f63,
type: 3}
propertyPath: m_LocalPosition.z
- value: -3.1300006
+ value: -3.1300004
objectReference: {fileID: 0}
- target: {fileID: 557383556243119057, guid: 5ac231bd690a7c94c922e705e97b4f63,
type: 3}
@@ -8237,7 +8242,7 @@
- target: {fileID: 557383556243119057, guid: 5ac231bd690a7c94c922e705e97b4f63,
type: 3}
propertyPath: m_LocalScale.z
- value: 0.5
+ value: 0.32
objectReference: {fileID: 0}
- target: {fileID: 557383556243119058, guid: 5ac231bd690a7c94c922e705e97b4f63,
type: 3}
@@ -8582,22 +8587,22 @@
- target: {fileID: 557383556243119057, guid: 5ac231bd690a7c94c922e705e97b4f63,
type: 3}
propertyPath: m_LocalPosition.z
- value: -3.13
+ value: -3.1300004
objectReference: {fileID: 0}
- target: {fileID: 557383556243119057, guid: 5ac231bd690a7c94c922e705e97b4f63,
type: 3}
propertyPath: m_LocalRotation.x
- value: 0
+ value: -0
objectReference: {fileID: 0}
- target: {fileID: 557383556243119057, guid: 5ac231bd690a7c94c922e705e97b4f63,
type: 3}
propertyPath: m_LocalRotation.y
- value: 0
+ value: -0
objectReference: {fileID: 0}
- target: {fileID: 557383556243119057, guid: 5ac231bd690a7c94c922e705e97b4f63,
type: 3}
propertyPath: m_LocalRotation.z
- value: 0
+ value: -0
objectReference: {fileID: 0}
- target: {fileID: 557383556243119057, guid: 5ac231bd690a7c94c922e705e97b4f63,
type: 3}
@@ -8627,7 +8632,7 @@
- target: {fileID: 557383556243119057, guid: 5ac231bd690a7c94c922e705e97b4f63,
type: 3}
propertyPath: m_LocalScale.z
- value: 0.5
+ value: 0.32
objectReference: {fileID: 0}
- target: {fileID: 557383556243119058, guid: 5ac231bd690a7c94c922e705e97b4f63,
type: 3}
@@ -9494,8 +9499,8 @@
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1977355534}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
- m_LocalPosition: {x: 0.08, y: 0.98, z: 7.24}
- m_LocalScale: {x: 0.79999995, y: 1, z: 3.3}
+ m_LocalPosition: {x: 0.08, y: 0.98, z: 9.84}
+ m_LocalScale: {x: 0.79999995, y: 1, z: 3.82}
m_Children:
- {fileID: 1743561840}
m_Father: {fileID: 304173789}
@@ -9642,7 +9647,7 @@
- target: {fileID: 557383556243119057, guid: 5ac231bd690a7c94c922e705e97b4f63,
type: 3}
propertyPath: m_LocalScale.z
- value: 0.5
+ value: 0.32
objectReference: {fileID: 0}
- target: {fileID: 557383556243119058, guid: 5ac231bd690a7c94c922e705e97b4f63,
type: 3}
diff --git a/Assets/Scripts/GameAnalytics_SDK/UI/LoginUI.cs b/Assets/Scripts/GameAnalytics_SDK/UI/LoginUI.cs
index 0b52d31..add4710 100644
--- a/Assets/Scripts/GameAnalytics_SDK/UI/LoginUI.cs
+++ b/Assets/Scripts/GameAnalytics_SDK/UI/LoginUI.cs
@@ -28,7 +28,6 @@
{
EventCenter.Ins.RemoveAllListener();
- TowerDefense.Towers.Placement.TowerPlacementGridEndless.GRID_OPENCASH = 100;
isLogining = false;
diff --git a/Assets/Scripts/TowerDefense/Towers/Placement/TowerPlacementGridEndless.cs b/Assets/Scripts/TowerDefense/Towers/Placement/TowerPlacementGridEndless.cs
index aba7633..03239eb 100644
--- a/Assets/Scripts/TowerDefense/Towers/Placement/TowerPlacementGridEndless.cs
+++ b/Assets/Scripts/TowerDefense/Towers/Placement/TowerPlacementGridEndless.cs
@@ -629,6 +629,8 @@
m_arrTGO = new EndlessTowerGridOpen[dimensions.x, dimensions.y];
GameObject container = GameObject.Find("BuyButtonContainer");
+ TowerPlacementGridEndless.GRID_OPENCASH = 100;
+ //Debug.Log("修改了数值:" + TowerPlacementGridEndless.GRID_OPENCASH);
//float[] xup = { -0.6f, -0.3f, 0, 0.3f, 0.6f };
for (int x = 0; x < dimensions.x; ++x)
{
diff --git a/Assets/Scripts/UI/FinalPanel/FinalPanel.cs b/Assets/Scripts/UI/FinalPanel/FinalPanel.cs
index 249d208..b183d88 100644
--- a/Assets/Scripts/UI/FinalPanel/FinalPanel.cs
+++ b/Assets/Scripts/UI/FinalPanel/FinalPanel.cs
@@ -100,7 +100,7 @@
{
var temp = Math.Floor(value);
scoreText.text = temp + "";
- }, 0, myScore, 3.0f));
+ }, 0, myScore, 1.0f));
agentTweenSeq.AppendCallback(TextDoTweenFinish);
agentTweenSeq.Append(waveText.DOText(waveInfo, 0.2f));
--
Gitblit v1.9.1