fix bugs && add compare info

Author: cjsjy123

Assets/CalFps.cs

@@ -0,0 +1,41 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class CalFps : MonoBehaviour {
+
+    private float starttime;
+
+    private float endtime;
+
+    private int framecnt;
+
+	// Use this for initialization
+	void Start () {
+        Reset();
+    }
+
+    public void Reset()
+    {
+        starttime = Time.timeSinceLevelLoad;
+        framecnt = 0;
+        endtime = -1;
+    }
+	
+	// Update is called once per frame
+	void Update () {
+		if(Time.timeSinceLevelLoad - starttime <5f)
+        {
+            framecnt++;
+        }
+        else
+        {
+            if (endtime < 0)
+            {
+                endtime = Time.timeSinceLevelLoad;
+                float fps = framecnt / (endtime - starttime);
+                Debug.LogError(fps);
+            }
+        }
+    }
+}

Assets/CalFps.cs.meta

@@ -150,7 +150,7 @@ private void ShowBatchTools()
                     for (int j = 0; j < group.spritegroups.Count; ++j)
                     {
                         SpriteInfo info = group.spritegroups[j];
-                        float value = Mathf.Max(info.sprite.rect.x, info.sprite.rect.y);
+                        float value = Mathf.Max(info.sprite.rect.width, info.sprite.rect.height);
                         group.size = Mathf.Max(value, group.size);
                         group.width = 1;
                     }

Assets/TextInlineSprite.meta

@@ -98,7 +98,7 @@ MonoBehaviour:
     m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
       Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
   m_FontData:
-    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+    m_Font: {fileID: 12800000, guid: 323ac1ea6ff04144f9f5b613bfbc5597, type: 3}
     m_FontSize: 14
     m_FontStyle: 0
     m_BestFit: 0
@@ -110,7 +110,7 @@ MonoBehaviour:
     m_HorizontalOverflow: 0
     m_VerticalOverflow: 1
     m_LineSpacing: 1
-  m_Text: New Text[#emoji_0]000000000000000000000000000000000
+  m_Text: 
   OnHrefClick:
     m_PersistentCalls:
       m_Calls: []

Assets/TextInlineSprite/.DS_Store

@@ -38,7 +38,7 @@ RenderSettings:
   m_ReflectionIntensity: 1
   m_CustomReflection: {fileID: 0}
   m_Sun: {fileID: 0}
-  m_IndirectSpecularColor: {r: 0.44657868, g: 0.49641263, b: 0.57481706, a: 1}
+  m_IndirectSpecularColor: {r: 0.44657898, g: 0.4964133, b: 0.5748178, a: 1}
 --- !u!157 &3
 LightmapSettings:
   m_ObjectHideFlags: 0
@@ -77,17 +77,15 @@ LightmapSettings:
     m_PVRDirectSampleCount: 32
     m_PVRSampleCount: 500
     m_PVRBounces: 2
-    m_PVRFilterTypeDirect: 0
-    m_PVRFilterTypeIndirect: 0
-    m_PVRFilterTypeAO: 0
+    m_PVRFiltering: 0
     m_PVRFilteringMode: 0
     m_PVRCulling: 1
     m_PVRFilteringGaussRadiusDirect: 1
     m_PVRFilteringGaussRadiusIndirect: 5
     m_PVRFilteringGaussRadiusAO: 2
-    m_PVRFilteringAtrousPositionSigmaDirect: 0.5
-    m_PVRFilteringAtrousPositionSigmaIndirect: 2
-    m_PVRFilteringAtrousPositionSigmaAO: 1
+    m_PVRFilteringAtrousColorSigma: 1
+    m_PVRFilteringAtrousNormalSigma: 1
+    m_PVRFilteringAtrousPositionSigma: 1
   m_LightingDataAsset: {fileID: 0}
   m_ShadowMaskMode: 2
 --- !u!196 &4
@@ -346,7 +344,9 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 0ae7019e071d5fe4e9d442887a3ac0de, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  PreparedAtlas: []
+  PreparedAtlas:
+  - emoji
+  - emoji_lxh
   _openDebug: 0
   _animationspeed: 5
   _renderType: 0
@@ -490,7 +490,7 @@ MonoBehaviour:
   m_TargetGraphic: {fileID: 201184325}
   m_HandleRect: {fileID: 201184324}
   m_Direction: 2
-  m_Value: 0
+  m_Value: 1
   m_Size: 1
   m_NumberOfSteps: 0
   m_OnValueChanged:
@@ -678,7 +678,7 @@ MonoBehaviour:
   m_CaretColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
   m_CustomCaretColor: 0
   m_SelectionColor: {r: 0.65882355, g: 0.80784315, b: 1, a: 0.7529412}
-  m_Text: Send Message,[#emoji_8]&&[1#run]
+  m_Text: Send Message,12313[0#emoji_0]
   m_CaretBlinkRate: 0.85
   m_CaretWidth: 1
   m_ReadOnly: 0
@@ -1094,7 +1094,7 @@ MonoBehaviour:
     m_HorizontalOverflow: 1
     m_VerticalOverflow: 0
     m_LineSpacing: 1
-  m_Text: Send Message,[#emoji_8]&&[1#run]
+  m_Text: Send Message,12313[0#emoji_0]
 --- !u!1 &1148848366
 GameObject:
   m_ObjectHideFlags: 0
@@ -1104,6 +1104,7 @@ GameObject:
   m_Component:
   - component: {fileID: 1148848368}
   - component: {fileID: 1148848367}
+  - component: {fileID: 1148848369}
   m_Layer: 0
   m_Name: ScriptObject
   m_TagString: Untagged
@@ -1127,6 +1128,8 @@ MonoBehaviour:
   _ChatParent: {fileID: 593063447}
   _ViewContent: {fileID: 593063447}
   _InputText: {fileID: 702706682}
+  cal: {fileID: 1148848369}
+  testcnt: 1
 --- !u!4 &1148848368
 Transform:
   m_ObjectHideFlags: 0
@@ -1140,6 +1143,17 @@ Transform:
   m_Father: {fileID: 0}
   m_RootOrder: 4
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &1148848369
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 1148848366}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: bb6b32188d4e72d42b6da48480b300b5, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!1 &1184607120
 GameObject:
   m_ObjectHideFlags: 0