瀏覽代碼

打包成功

hexiaojie 1 月之前
父節點
當前提交
c7f1c2b44b

+ 2 - 2
GameClient/Assets/Game/Launcher/LauncherConfig.cs

@@ -73,7 +73,7 @@ namespace GFGGame
 
         public static void InitScriptCompilation()
         {
-            launcherRootUrl = "http://cdn.goufuguiwxw.com/";
+            launcherRootUrl = "https://cdn.goufuguiwxw.com/";
 #if PT_DEV
             //外网dev版本
             netType = EnumNetType.LOCAL;
@@ -93,7 +93,7 @@ namespace GFGGame
             ChannelId = (int)ChannelID.DouYou;
 #elif GFGZSB
             netType = EnumNetType.PUBLIC;
-            cfgName = "cfg_gfg2";
+            cfgName = "cfg_gfg";
             ChannelId = (int)ChannelID.DouYou;
 #elif PT_IOS
             netType = EnumNetType.PUBLIC;

+ 1 - 1
GameClient/Assets/Game/Launcher/Platform/Pay/AliPayManagerInit.cs

@@ -31,7 +31,7 @@ namespace GFGGame.Launcher
                 gameObject.AddComponent<AliDKHandler>();
                 GameObject.DontDestroyOnLoad(gameObject);
             }
-
+            
             InitVxSdk(LauncherConfig.vxSdkAppId);
         }
 

+ 1 - 1
GameClient/Assets/Plugins/Android/com.unity3d.player/PrivacyActivity.java

@@ -67,7 +67,7 @@ public class PrivacyActivity extends Activity implements DialogInterface.OnClick
     // 启动Unity Activity
     private void EnterUnityActivity(){
         Intent unityAct = new Intent();
-        unityAct.setClassName(this, "com.unity3d.player.UnityPlayerActivity");
+        unityAct.setClassName(this, "com.wsj.Imgdt3.GFGMainActivity");
         this.startActivity(unityAct);
     }
     

+ 8 - 0
GameClient/Assets/Plugins/Android/res/drawable-mdpi.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: a116cc9f1cb5ef945bef84bff8f7c6f6
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

二進制
GameClient/Assets/Plugins/Android/res/drawable-mdpi/app_icon.png


+ 1 - 1
GameClient/Assets/Plugins/Android/res/drawable/ic_launcher.png.meta → GameClient/Assets/Plugins/Android/res/drawable-mdpi/app_icon.png.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: e8f380d76eb550e449a22ddc397bfc7f
+guid: 06591d8d655c91d4282f48ac76acf924
 DefaultImporter:
   externalObjects: {}
   userData: 

二進制
GameClient/Assets/Plugins/Android/res/drawable/app_icon.png


二進制
GameClient/Assets/Plugins/Android/res/drawable/ic_launcher.png


+ 0 - 176
GameClient/Assets/Plugins/com/easy/bridge/WXEntryActivity.java

@@ -1,176 +0,0 @@
-// package com.wsj.Imgdt3;
-
-// import android.app.Activity;
-// import android.content.Intent;
-// import android.os.Bundle;
-// import android.os.Handler;
-// import android.os.Message;
-// import android.widget.Toast;
-
-// import com.tencent.mm.opensdk.constants.ConstantsAPI;
-// import com.tencent.mm.opensdk.modelbase.BaseReq;
-// import com.tencent.mm.opensdk.modelbase.BaseResp;
-// import com.tencent.mm.opensdk.modelbiz.SubscribeMessage;
-// import com.tencent.mm.opensdk.modelbiz.WXLaunchMiniProgram;
-// import com.tencent.mm.opensdk.modelbiz.WXOpenBusinessView;
-// import com.tencent.mm.opensdk.modelbiz.WXOpenBusinessWebview;
-// import com.tencent.mm.opensdk.modelmsg.SendAuth;
-// import com.tencent.mm.opensdk.modelmsg.ShowMessageFromWX;
-// import com.tencent.mm.opensdk.modelmsg.WXAppExtendObject;
-// import com.tencent.mm.opensdk.modelmsg.WXMediaMessage;
-// import com.tencent.mm.opensdk.openapi.IWXAPI;
-// import com.tencent.mm.opensdk.openapi.IWXAPIEventHandler;
-// import com.tencent.mm.opensdk.openapi.WXAPIFactory;
-
-// import java.lang.ref.WeakReference;
-
-// public class WXEntryActivity extends Activity implements IWXAPIEventHandler{
-//     private static String TAG = "MicroMsg.WXEntryActivity";
-
-//     private IWXAPI api;
-//     private MyHandler handler;
-//     public static String wxAPPID = "wxd9772f42f126413f"; //可以设置成全局变量
-//     private static class MyHandler extends Handler {
-//         private final WeakReference<WXEntryActivity> wxEntryActivityWeakReference;
-
-//         public MyHandler(WXEntryActivity wxEntryActivity){
-//             wxEntryActivityWeakReference = new WeakReference<WXEntryActivity>(wxEntryActivity);
-//         }
-
-//         @Override
-//         public void handleMessage(Message msg) {
-//             int tag = msg.what;
-
-//         }
-//     }
-
-//     @Override
-//     public void onCreate(Bundle savedInstanceState) {
-//         super.onCreate(savedInstanceState);
-
-//         api = WXAPIFactory.createWXAPI(this, wxAPPID, false);
-//         handler = new MyHandler(this);
-
-//         try {
-//             Intent intent = getIntent();
-//             api.handleIntent(intent, this);
-//         } catch (Exception e) {
-//             e.printStackTrace();
-//         }
-//     }
-
-//     @Override
-//     protected void onNewIntent(Intent intent) {
-//         super.onNewIntent(intent);
-
-//         setIntent(intent);
-//         api.handleIntent(intent, this);
-//     }
-
-//     @Override
-//     public void onReq(BaseReq req) {
-//         switch (req.getType()) {
-//             case ConstantsAPI.COMMAND_GETMESSAGE_FROM_WX:
-//                 goToGetMsg();
-//                 break;
-//             case ConstantsAPI.COMMAND_SHOWMESSAGE_FROM_WX:
-//                 goToShowMsg((ShowMessageFromWX.Req) req);
-//                 break;
-//             default:
-//                 break;
-//         }
-//         finish();
-//     }
-
-//     @Override
-//     public void onResp(BaseResp resp) {
-//         int result = 0;
-
-//         switch (resp.errCode) {
-//             case BaseResp.ErrCode.ERR_OK:
-
-//                 break;
-//             case BaseResp.ErrCode.ERR_USER_CANCEL:
-
-//                 break;
-//             case BaseResp.ErrCode.ERR_AUTH_DENIED:
-
-//                 break;
-//             case BaseResp.ErrCode.ERR_UNSUPPORT:
-
-//                 break;
-//             default:
-//                 break;
-//         }
-
-//         Toast.makeText(this, getString(result) + ", type=" + resp.getType(), Toast.LENGTH_SHORT).show();
-
-
-//         if (resp.getType() == ConstantsAPI.COMMAND_SUBSCRIBE_MESSAGE) {
-//             SubscribeMessage.Resp subscribeMsgResp = (SubscribeMessage.Resp) resp;
-//             String text = String.format("openid=%s\ntemplate_id=%s\nscene=%d\naction=%s\nreserved=%s",
-//                     subscribeMsgResp.openId, subscribeMsgResp.templateID, subscribeMsgResp.scene, subscribeMsgResp.action, subscribeMsgResp.reserved);
-
-//             Toast.makeText(this, text, Toast.LENGTH_LONG).show();
-//         }
-
-//         if (resp.getType() == ConstantsAPI.COMMAND_LAUNCH_WX_MINIPROGRAM) {
-//             WXLaunchMiniProgram.Resp launchMiniProgramResp = (WXLaunchMiniProgram.Resp) resp;
-//             String text = String.format("openid=%s\nextMsg=%s\nerrStr=%s",
-//                     launchMiniProgramResp.openId, launchMiniProgramResp.extMsg,launchMiniProgramResp.errStr);
-
-//             Toast.makeText(this, text, Toast.LENGTH_LONG).show();
-//         }
-
-//         if (resp.getType() == ConstantsAPI.COMMAND_OPEN_BUSINESS_VIEW) {
-//             WXOpenBusinessView.Resp launchMiniProgramResp = (WXOpenBusinessView.Resp) resp;
-//             String text = String.format("openid=%s\nextMsg=%s\nerrStr=%s\nbusinessType=%s",
-//                     launchMiniProgramResp.openId, launchMiniProgramResp.extMsg,launchMiniProgramResp.errStr,launchMiniProgramResp.businessType);
-
-//             Toast.makeText(this, text, Toast.LENGTH_LONG).show();
-//         }
-
-//         if (resp.getType() == ConstantsAPI.COMMAND_OPEN_BUSINESS_WEBVIEW) {
-//             WXOpenBusinessWebview.Resp response = (WXOpenBusinessWebview.Resp) resp;
-//             String text = String.format("businessType=%d\nresultInfo=%s\nret=%d",response.businessType,response.resultInfo,response.errCode);
-
-//             Toast.makeText(this, text, Toast.LENGTH_LONG).show();
-//         }
-
-//         if (resp.getType() == ConstantsAPI.COMMAND_SENDAUTH) {
-//             SendAuth.Resp authResp = (SendAuth.Resp)resp;
-//             final String code = authResp.code;
-
-//         }
-//         finish();
-//     }
-
-//     private void goToGetMsg() {
-//         // Intent intent = new Intent(this, GetFromWXActivity.class);
-//         //  intent.putExtras(getIntent());
-//         //  startActivity(intent);
-//         finish();
-//     }
-
-//     private void goToShowMsg(ShowMessageFromWX.Req showReq) {
-//         WXMediaMessage wxMsg = showReq.message;
-//         WXAppExtendObject obj = (WXAppExtendObject) wxMsg.mediaObject;
-
-//         StringBuffer msg = new StringBuffer();
-//         msg.append("description: ");
-//         msg.append(wxMsg.description);
-//         msg.append("\n");
-//         msg.append("extInfo: ");
-//         msg.append(obj.extInfo);
-//         msg.append("\n");
-//         msg.append("filePath: ");
-//         msg.append(obj.filePath);
-
-//         //       Intent intent = new Intent(this, ShowFromWXActivity.class);
-//         //      intent.putExtra(Constants.ShowMsgActivity.STitle, wxMsg.title);
-//         //      intent.putExtra(Constants.ShowMsgActivity.SMessage, msg.toString());
-//         //       intent.putExtra(Constants.ShowMsgActivity.BAThumbData, wxMsg.thumbData);
-//         //       startActivity(intent);
-//         finish();
-//     }
-// }

+ 0 - 32
GameClient/Assets/Plugins/com/easy/bridge/WXEntryActivity.java.meta

@@ -1,32 +0,0 @@
-fileFormatVersion: 2
-guid: 7cf8ecac30ebf2544b56004b1b2a26cb
-PluginImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  iconMap: {}
-  executionOrder: {}
-  defineConstraints: []
-  isPreloaded: 0
-  isOverridable: 0
-  isExplicitlyReferenced: 0
-  validateReferences: 1
-  platformData:
-  - first:
-      Android: Android
-    second:
-      enabled: 1
-      settings: {}
-  - first:
-      Any: 
-    second:
-      enabled: 0
-      settings: {}
-  - first:
-      Editor: Editor
-    second:
-      enabled: 0
-      settings:
-        DefaultValueInitialized: true
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

+ 0 - 1
GameClient/Assets/Plugins/com/easy/bridge/WXPayEntryActivity.java

@@ -38,7 +38,6 @@ public class WXPayEntryActivity extends Activity implements IWXAPIEventHandler{
     public void onResp(BaseResp resp) {
         String result = resp.errCode+"";
         UnityPlayer.UnitySendMessage("AliPayGameObject", "VxPayReceive", result);
-        Log.d("WXPayEntryActivity", "weixin回调, errCode = " + resp.errCode);
         finish();
     }
 }

二進制
GameClient/Assets/Resources/mipmap/app_icon.png


+ 24 - 18
GameClient/ProjectSettings/ProjectSettings.asset

@@ -284,62 +284,68 @@ PlayerSettings:
     - m_Textures: []
       m_Width: 192
       m_Height: 192
-      m_Kind: 1
+      m_Kind: 0
       m_SubKind: 
     - m_Textures: []
       m_Width: 144
       m_Height: 144
-      m_Kind: 1
+      m_Kind: 0
       m_SubKind: 
     - m_Textures: []
       m_Width: 96
       m_Height: 96
-      m_Kind: 1
+      m_Kind: 0
       m_SubKind: 
     - m_Textures: []
       m_Width: 72
       m_Height: 72
-      m_Kind: 1
+      m_Kind: 0
       m_SubKind: 
     - m_Textures: []
       m_Width: 48
       m_Height: 48
-      m_Kind: 1
+      m_Kind: 0
       m_SubKind: 
     - m_Textures: []
       m_Width: 36
       m_Height: 36
-      m_Kind: 1
+      m_Kind: 0
       m_SubKind: 
-    - m_Textures: []
+    - m_Textures:
+      - {fileID: 0}
       m_Width: 192
       m_Height: 192
-      m_Kind: 0
+      m_Kind: 1
       m_SubKind: 
-    - m_Textures: []
+    - m_Textures:
+      - {fileID: 0}
       m_Width: 144
       m_Height: 144
-      m_Kind: 0
+      m_Kind: 1
       m_SubKind: 
-    - m_Textures: []
+    - m_Textures:
+      - {fileID: 0}
       m_Width: 96
       m_Height: 96
-      m_Kind: 0
+      m_Kind: 1
       m_SubKind: 
-    - m_Textures: []
+    - m_Textures:
+      - {fileID: 0}
       m_Width: 72
       m_Height: 72
-      m_Kind: 0
+      m_Kind: 1
       m_SubKind: 
-    - m_Textures: []
+    - m_Textures:
+      - {fileID: 0}
       m_Width: 48
       m_Height: 48
-      m_Kind: 0
+      m_Kind: 1
       m_SubKind: 
-    - m_Textures: []
+    - m_Textures:
+      - {fileID: 0}
       m_Width: 36
       m_Height: 36
-      m_Kind: 0
+      m_Kind: 1
       m_SubKind: 
     - m_Textures:
       - {fileID: 2800000, guid: 0f9a8f9c19c098a4ca423f4ecd585a82, type: 3}