同步

Conch/build/conch/proj.android_studio/conch5/build.gradle

@@ -9,8 +9,8 @@ android {
     defaultConfig {
         minSdkVersion 14
         targetSdkVersion 28
-        versionCode 17
-        versionName "release-2.9.0"
+        versionCode 19
+        versionName "release-2.11.0"
     }
     sourceSets.main{
         jniLibs.srcDir 'libs'

Conch/build/conch/proj.android_studio/conch5/src/main/assets/scripts/apploader.js

@@ -2835,6 +2835,7 @@ class GLCommandEncoder {
     }
     getExtension(name) {
         var extention = this._layagl._nativeObj.getStringEx(0x1F03);
+        let version = this._layagl._nativeObj.getStringEx(0x1F02);
         let extentions = extention.split(' ');
         function supports(extention) {
             for (let ext of extentions) {
@@ -2860,7 +2861,7 @@ class GLCommandEncoder {
             (extention.indexOf('GL_EXT_shader_texture_lod') != -1 || extention.indexOf('GL_ARB_shader_texture_lod') != -1)) {
             return {};
         }
-        else if (name === 'OES_element_index_uint' && extention.indexOf('GL_OES_element_index_uint') != -1) {
+        else if (name === 'OES_element_index_uint' && (extention.indexOf('GL_OES_element_index_uint') != -1)) {
             return {};
         }
         else if (name === 'EXT_sRGB' && extention.indexOf('GL_EXT_sRGB') != -1) {
@@ -2915,13 +2916,16 @@ class GLCommandEncoder {
                 TEXTURE_MAX_ANISOTROPY_EXT: 34046,
             };
         }
-        else if (name.indexOf('ANGLE_instanced_arrays') != -1 && (conchConfig.glCaps & GL_CAPS.INSTANCEING)) {
+        else if (name.indexOf('ANGLE_instanced_arrays') != -1 && ((extention.indexOf('_instanced_arrays') != -1) || version.indexOf("OpenGL ES 3.") != -1)) {
             return new ANGLEInstancedArrays(this);
         }
-        else if (name.indexOf('OES_vertex_array_object') != -1 && extention.indexOf('GL_OES_vertex_array_object') != -1) {
+        else if (name.indexOf('OES_vertex_array_object') != -1 && (extention.indexOf('GL_OES_vertex_array_object') != -1)) {
             return new OESVertexArrayObject(this);
         }
-        else if (name.indexOf('OES_texture_half_float') != -1 && extention.indexOf('GL_OES_texture_half_float') != -1) {
+        else if (name.indexOf('OES_texture_float') != -1 && extention.indexOf('GL_OES_texture_float') != -1) {
+            return {};
+        }
+        else if (name.indexOf('OES_texture_half_float') != -1 && (extention.indexOf('GL_OES_texture_half_float') != -1)) {
             return { HALF_FLOAT_OES: 36193 };
         }
         else if (name.indexOf('OES_texture_half_float_linear') != -1 && extention.indexOf('GL_OES_texture_half_float_linear') != -1) {

Conch/build/conch/proj.android_studio/conch5/src/main/java/layaair/game/browser/ExportJavaFunction.java

@@ -955,7 +955,7 @@ public class ExportJavaFunction
 		m_Handler.post(new _Runnable(nCmd, nParam1, nParam2));
 	}
 	//------------------------------------------------------------------------------
-	public static String getWifiMac()
+	/*public static String getWifiMac()
 	{
 		ExportJavaFunction exp = ExportJavaFunction.GetInstance();
 		if(exp==null )
@@ -967,7 +967,7 @@ public class ExportJavaFunction
 			return (wifi==null)?"":wifi;
 		}
 		return "";
-	}
+	}*/
 	//------------------------------------------------------------------------------
 	public static String getAndroidModel()
 	{
@@ -1103,7 +1103,7 @@ public class ExportJavaFunction
 			int temp[]=pDevID.GetResolutionArray();
 			obj.put("dpi", temp[2]);
 			obj.put("resolution",temp[1]+"*"+temp[0]);
-			obj.put("guid",pDevID.GetWifiMac());
+			//obj.put("guid",pDevID.GetWifiMac());
 			obj.put("imei", imeiArr);
 			obj.put("imsi", imsiArr);
 			obj.put("os", "android");

Conch/build/conch/proj.android_studio/conch5/src/main/java/layaair/game/browser/TouchFilter.java

@@ -1,5 +1,7 @@
 package layaair.game.browser;
 
+import android.app.Activity;
+import android.util.DisplayMetrics;
 import android.util.Log;
 import android.view.MotionEvent;
 
@@ -40,7 +42,13 @@ public class TouchFilter
 			m_vTouches[i].m_nLastMoveY = 0;
 			m_vTouches[i].m_nTouchState = TouchPoint.PTSTATE_NOTOUCH;
 		}
-		setMoveRangeMM( 0.8f ); 
+		setMoveRangeMM( getScreenDPI() * 2 );
+
+	}
+	public int getScreenDPI() {
+		ExportJavaFunction exp = ExportJavaFunction.GetInstance();
+		DisplayMetrics metrics = ((Activity)exp.m_pEngine.mCtx).getApplicationContext().getResources().getDisplayMetrics();
+		return (int)(metrics.density * 160f);
 	}
 
 	//外部设置移动的偏差毫米为单位
@@ -49,6 +57,7 @@ public class TouchFilter
 		//毫米转英寸
 		float fInch = (float) (p_fMM/10.0f*0.3937008);
 		m_nMovRange = Math.round( fInch );
+		Log.i("LayaBox", "TouchFilter getScreenDPI() " + getScreenDPI()  + " TouchFilter m_nMovRange " + m_nMovRange);
 	}
     
     TouchPoint GetTouchPt(int p_nID)

Conch/build/conch/proj.android_studio/conch5/src/main/java/layaair/game/device/DevID.java

@@ -30,11 +30,11 @@ public class DevID
 		String devsn = GetDevSerial();
 		if( devsn!=null && devsn.length()>0)
 			return devsn;
-		String wifimac = GetWifiMac();
+		/*String wifimac = GetWifiMac();
 		if( wifimac !=null && wifimac.length()>0 )
 		{
 			return wifimac.replace(":", "");
-		}
+		}*/
 		String androidid = GetAndroidID();
 		if( androidid!=null && androidid.length()>0 )
 			return androidid;
@@ -139,13 +139,13 @@ public class DevID
         } else return "NA";
         return res;
     }
-	public String GetWifiMac()
+	/*public String GetWifiMac()
 	{
 		String mac= getMac();
 		return mac;
 		//WifiManager wm = (WifiManager) m_Context.getApplicationContext().getSystemService(Context.WIFI_SERVICE);
 		//return wm.getConnectionInfo().getMacAddress();
-	}
+	}*/
 
 	private static String parseByte(byte b) {
 		String s = "00" + Integer.toHexString(b)+":";