Merge branch 'master' of http://git.mokasz.com/zouyong/team2_nc

assets/Scripts/mk/util/EncryptUtil.ts

@@ -1,5 +1,5 @@
 import { hmacSha256 } from "./encrypt/hmacSha256";
-import * as CryptoJS from "./encrypt/rsa/crypto-js";
+import * as CryptoJS from "./encrypt/aes.js";
 
 
 /**