From 56d95fa59a9f6dc12d0fc0723ea449e5b317f994 Mon Sep 17 00:00:00 2001
From: liuzhiwei <liuzhiwei@qq.com>
Date: Sat, 26 Dec 2020 14:05:00 +0800
Subject: [PATCH] Merge branch 'master' of http://47.95.218.140:8090/r/GemBattle into master
---
Assets/Prefabs/UI/TextCrit.prefab | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/Assets/Prefabs/UI/TextCrit.prefab b/Assets/Prefabs/UI/TextCrit.prefab
index 1bd3af4..746f6ec 100644
--- a/Assets/Prefabs/UI/TextCrit.prefab
+++ b/Assets/Prefabs/UI/TextCrit.prefab
@@ -73,7 +73,7 @@
m_GameObject: {fileID: 8440900062448590361}
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: 1.2, y: 1.2, z: 1.2}
m_Children:
- {fileID: 921286385742553488}
m_Father: {fileID: 0}
@@ -105,6 +105,8 @@
m_Name:
m_EditorClassIdentifier:
bloodText: {fileID: 6612050379255928648}
+ SlowDownWord: {fileID: 0}
+ CritWord: {fileID: 0}
--- !u!114 &8440900062448590822
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -117,7 +119,7 @@
m_Script: {fileID: 11500000, guid: 59d007c1fe5e41c1888e4af3392f8676, type: 3}
m_Name:
m_EditorClassIdentifier:
- initialPoolCapacity: 100
+ initialPoolCapacity: 0
--- !u!114 &6612050379255928648
MonoBehaviour:
m_ObjectHideFlags: 0
--
Gitblit v1.9.1