Merge remote-tracking branch 'origin/dev_cyp' into dev_nonearth

Assets/AndroidUpdate.cs

@@ -124,7 +124,7 @@ public class AndroidUpdate : PFUIPanel
         var activity = jc.GetStatic<AndroidJavaObject>("currentActivity");
         //Debug.Log("打开apk"+ "file://" + path);
         activity.Call("OpenApk", path);
-        Application.Quit();
+        //Application.Quit();
 #endif
     }
 }

Assets/Scripts/Utils/Utils.cs

@@ -234,6 +234,10 @@ namespace Assets.Scripts
                 {
                     return true;
                 }
+                else if (ai > bi)
+                {
+                    return false;
+                }
             }
             return false;
         }