Merge branch 'master' of http://gitlab.llewan.com/llewan/cdn

5ff7e284 · 谢汉德 · 54903ca3 · ae01c6f4 · 5ff7e284 · 5ff7e284
Commit 5ff7e284 authored May 23, 2019 by 谢汉德
55 changed files
--- a/jietoulanqiu/h5/demo_2/index.html
+++ b/jietoulanqiu/h5/demo_2/index.html
+<html>
+
+<head>
+    <title>www.layabox.com</title>
+    <meta charset='utf-8' />
+    <meta name='renderer' content='webkit' />
+    <meta name='viewport' content='width=device-width,initial-scale=1.0,minimum-scale=1.0,maximum-scale=1.0,user-scalable=no'
+    />
+    <meta name='apple-mobile-web-app-capable' content='yes' />
+    <meta name='full-screen' content='true' />
+    <meta name='x5-fullscreen' content='true' />
+    <meta name='360-fullscreen' content='true' />
+    <meta name='laya' screenorientation='landscape' />
+    <meta http-equiv='expires' content='0' />
+    <meta http-equiv='X-UA-Compatible' content='IE=edge,chrome=1' />
+    <meta http-equiv='expires' content='0' />
+    <meta http-equiv='Cache-Control' content='no-siteapp' />
+</head>
+
+<body>
+    <script type="text/javascript">
+        function loadLib(url) {
+            var script = document.createElement("script");
+            script.async = false;
+            script.src = url;
+            document.body.appendChild(script);
+        }
+    </script>
+    <script type="text/javascript" src="index.js"></script>
+</body>
+
+</html>
\ No newline at end of file
--- a/jietoulanqiu/h5/demo_2/index.js
+++ b/jietoulanqiu/h5/demo_2/index.js
+/**
+ * 设置LayaNative屏幕方向，可设置以下值
+ * landscape           横屏
+ * portrait            竖屏
+ * sensor_landscape    横屏(双方向)
+ * sensor_portrait     竖屏(双方向)
+ */
+window.screenOrientation = "portrait";
+
+//-----libs-begin-----
+loadLib("libs/laya.core.js");
+loadLib("libs/laya.webgl.js");
+loadLib("libs/laya.html.js");
+loadLib("libs/laya.physics3D.js");
+loadLib("libs/laya.d3.js")//-----libs-end-------
+
+loadLib("libs/fairygui.js");
+loadLib("js/bundle.js");
--- a/jietoulanqiu/h5/demo_2/js/bundle.js
+++ b/jietoulanqiu/h5/demo_2/js/bundle.js
--- a/jietoulanqiu/h5/demo_2/libs/fairygui.js
+++ b/jietoulanqiu/h5/demo_2/libs/fairygui.js
--- a/jietoulanqiu/h5/demo_2/libs/laya.core.js
+++ b/jietoulanqiu/h5/demo_2/libs/laya.core.js
--- a/jietoulanqiu/h5/demo_2/libs/laya.d3.js
+++ b/jietoulanqiu/h5/demo_2/libs/laya.d3.js
--- a/jietoulanqiu/h5/demo_2/libs/laya.html.js
+++ b/jietoulanqiu/h5/demo_2/libs/laya.html.js
--- a/jietoulanqiu/h5/demo_2/libs/laya.physics3D.js
+++ b/jietoulanqiu/h5/demo_2/libs/laya.physics3D.js
--- a/jietoulanqiu/h5/demo_2/libs/laya.webgl.js
+++ b/jietoulanqiu/h5/demo_2/libs/laya.webgl.js
--- a/jietoulanqiu/h5/demo_2/res/3d/scene/Conventional/Assets/Assets/Textures/Baodian/baodain_efc_8.lmat
+++ b/jietoulanqiu/h5/demo_2/res/3d/scene/Conventional/Assets/Assets/Textures/Baodian/baodain_efc_8.lmat
--- a/jietoulanqiu/h5/demo_2/res/3d/scene/Conventional/Assets/Assets/Textures/Baodian/baodain_efc_8.png
+++ b/jietoulanqiu/h5/demo_2/res/3d/scene/Conventional/Assets/Assets/Textures/Baodian/baodain_efc_8.png
--- a/jietoulanqiu/h5/demo_2/res/3d/scene/Conventional/Assets/BBP_8138tris/Materials/BBP_clothes_D.lmat
+++ b/jietoulanqiu/h5/demo_2/res/3d/scene/Conventional/Assets/BBP_8138tris/Materials/BBP_clothes_D.lmat
--- a/jietoulanqiu/h5/demo_2/res/3d/scene/Conventional/Assets/BBP_8138tris/Materials/BBP_skin_D.lmat
+++ b/jietoulanqiu/h5/demo_2/res/3d/scene/Conventional/Assets/BBP_8138tris/Materials/BBP_skin_D.lmat
--- a/jietoulanqiu/h5/demo_2/res/3d/scene/Conventional/Assets/BBP_8138tris/Materials/basketball_D.lmat
+++ b/jietoulanqiu/h5/demo_2/res/3d/scene/Conventional/Assets/BBP_8138tris/Materials/basketball_D.lmat
--- a/jietoulanqiu/h5/demo_2/res/3d/scene/Conventional/Assets/BBP_8138tris/Models/BBP_t-pose-PlayerModel-BBP_t-poseAvatar.lav
+++ b/jietoulanqiu/h5/demo_2/res/3d/scene/Conventional/Assets/BBP_8138tris/Models/BBP_t-pose-PlayerModel-BBP_t-poseAvatar.lav
--- a/jietoulanqiu/h5/demo_2/res/3d/scene/Conventional/Assets/BBP_8138tris/Models/BBP_t-pose-basket_player.lm
+++ b/jietoulanqiu/h5/demo_2/res/3d/scene/Conventional/Assets/BBP_8138tris/Models/BBP_t-pose-basket_player.lm
--- a/jietoulanqiu/h5/demo_2/res/3d/scene/Conventional/Assets/BBP_8138tris/Models/Ball-Ball-BallAvatar.lav
+++ b/jietoulanqiu/h5/demo_2/res/3d/scene/Conventional/Assets/BBP_8138tris/Models/Ball-Ball-BallAvatar.lav
--- a/jietoulanqiu/h5/demo_2/res/3d/scene/Conventional/Assets/BBP_8138tris/Models/Ball-basketball_low.lm
+++ b/jietoulanqiu/h5/demo_2/res/3d/scene/Conventional/Assets/BBP_8138tris/Models/Ball-basketball_low.lm
--- a/jietoulanqiu/h5/demo_2/res/3d/scene/Conventional/Assets/BBP_8138tris/Models/single_animations/BBP_dibble-Dibble.lani
+++ b/jietoulanqiu/h5/demo_2/res/3d/scene/Conventional/Assets/BBP_8138tris/Models/single_animations/BBP_dibble-Dibble.lani
--- a/jietoulanqiu/h5/demo_2/res/3d/scene/Conventional/Assets/BBP_8138tris/Models/single_animations/BBP_free_throw-FakeThrow.lani
+++ b/jietoulanqiu/h5/demo_2/res/3d/scene/Conventional/Assets/BBP_8138tris/Models/single_animations/BBP_free_throw-FakeThrow.lani
--- a/jietoulanqiu/h5/demo_2/res/3d/scene/Conventional/Assets/BBP_8138tris/Models/single_animations/BBP_free_throw-Throw.lani
+++ b/jietoulanqiu/h5/demo_2/res/3d/scene/Conventional/Assets/BBP_8138tris/Models/single_animations/BBP_free_throw-Throw.lani
--- a/jietoulanqiu/h5/demo_2/res/3d/scene/Conventional/Assets/BBP_8138tris/Models/single_animations/BBP_idle_with_ball-Ready.lani
+++ b/jietoulanqiu/h5/demo_2/res/3d/scene/Conventional/Assets/BBP_8138tris/Models/single_animations/BBP_idle_with_ball-Ready.lani
--- a/jietoulanqiu/h5/demo_2/res/3d/scene/Conventional/Assets/BBP_8138tris/Models/single_animations/BBP_other_dibble-Dibble.lani
+++ b/jietoulanqiu/h5/demo_2/res/3d/scene/Conventional/Assets/BBP_8138tris/Models/single_animations/BBP_other_dibble-Dibble.lani
--- a/jietoulanqiu/h5/demo_2/res/3d/scene/Conventional/Assets/BBP_8138tris/Textures/BBP_clothes_D.jpg
+++ b/jietoulanqiu/h5/demo_2/res/3d/scene/Conventional/Assets/BBP_8138tris/Textures/BBP_clothes_D.jpg
--- a/jietoulanqiu/h5/demo_2/res/3d/scene/Conventional/Assets/BBP_8138tris/Textures/BBP_skin_D.jpg
+++ b/jietoulanqiu/h5/demo_2/res/3d/scene/Conventional/Assets/BBP_8138tris/Textures/BBP_skin_D.jpg
--- a/jietoulanqiu/h5/demo_2/res/3d/scene/Conventional/Assets/BBP_8138tris/Textures/basketball_D.jpg
+++ b/jietoulanqiu/h5/demo_2/res/3d/scene/Conventional/Assets/BBP_8138tris/Textures/basketball_D.jpg
--- a/jietoulanqiu/h5/demo_2/res/3d/scene/Conventional/Assets/Demo/scene/1-Frame_aiji_ding_Afternoon.lm
+++ b/jietoulanqiu/h5/demo_2/res/3d/scene/Conventional/Assets/Demo/scene/1-Frame_aiji_ding_Afternoon.lm
--- a/jietoulanqiu/h5/demo_2/res/3d/scene/Conventional/Assets/Demo/scene/4-XN_di.lm
+++ b/jietoulanqiu/h5/demo_2/res/3d/scene/Conventional/Assets/Demo/scene/4-XN_di.lm
--- a/jietoulanqiu/h5/demo_2/res/3d/scene/Conventional/Assets/Demo/scene/4-XN_dimian.lm
+++ b/jietoulanqiu/h5/demo_2/res/3d/scene/Conventional/Assets/Demo/scene/4-XN_dimian.lm
--- a/jietoulanqiu/h5/demo_2/res/3d/scene/Conventional/Assets/Demo/scene/4-XN_guanzhong.lm
+++ b/jietoulanqiu/h5/demo_2/res/3d/scene/Conventional/Assets/Demo/scene/4-XN_guanzhong.lm
--- a/jietoulanqiu/h5/demo_2/res/3d/scene/Conventional/Assets/Demo/scene/4-XN_qiangmian.lm
+++ b/jietoulanqiu/h5/demo_2/res/3d/scene/Conventional/Assets/Demo/scene/4-XN_qiangmian.lm
--- a/jietoulanqiu/h5/demo_2/res/3d/scene/Conventional/Assets/Demo/scene/4-XN_qiuchang.lm
+++ b/jietoulanqiu/h5/demo_2/res/3d/scene/Conventional/Assets/Demo/scene/4-XN_qiuchang.lm
--- a/jietoulanqiu/h5/demo_2/res/3d/scene/Conventional/Assets/Demo/scene/4-XN_wujian.lm
+++ b/jietoulanqiu/h5/demo_2/res/3d/scene/Conventional/Assets/Demo/scene/4-XN_wujian.lm
--- a/jietoulanqiu/h5/demo_2/res/3d/scene/Conventional/Assets/Demo/scene/Materials/XN_di.lmat
+++ b/jietoulanqiu/h5/demo_2/res/3d/scene/Conventional/Assets/Demo/scene/Materials/XN_di.lmat
--- a/jietoulanqiu/h5/demo_2/res/3d/scene/Conventional/Assets/Demo/scene/Materials/XN_dimian.lmat
+++ b/jietoulanqiu/h5/demo_2/res/3d/scene/Conventional/Assets/Demo/scene/Materials/XN_dimian.lmat
--- a/jietoulanqiu/h5/demo_2/res/3d/scene/Conventional/Assets/Demo/scene/Materials/XN_guanzhong.lmat
+++ b/jietoulanqiu/h5/demo_2/res/3d/scene/Conventional/Assets/Demo/scene/Materials/XN_guanzhong.lmat
--- a/jietoulanqiu/h5/demo_2/res/3d/scene/Conventional/Assets/Demo/scene/Materials/XN_qiangmian.lmat
+++ b/jietoulanqiu/h5/demo_2/res/3d/scene/Conventional/Assets/Demo/scene/Materials/XN_qiangmian.lmat
--- a/jietoulanqiu/h5/demo_2/res/3d/scene/Conventional/Assets/Demo/scene/Materials/XN_qiuchang.lmat
+++ b/jietoulanqiu/h5/demo_2/res/3d/scene/Conventional/Assets/Demo/scene/Materials/XN_qiuchang.lmat
--- a/jietoulanqiu/h5/demo_2/res/3d/scene/Conventional/Assets/Demo/scene/Materials/XN_wujian.lmat
+++ b/jietoulanqiu/h5/demo_2/res/3d/scene/Conventional/Assets/Demo/scene/Materials/XN_wujian.lmat
--- a/jietoulanqiu/h5/demo_2/res/3d/scene/Conventional/Assets/Demo/scene/Materials/aiji_ding_Afternoon.lmat
+++ b/jietoulanqiu/h5/demo_2/res/3d/scene/Conventional/Assets/Demo/scene/Materials/aiji_ding_Afternoon.lmat
--- a/jietoulanqiu/h5/demo_2/res/3d/scene/Conventional/Assets/Demo/scene/textures/XN_di.jpg
+++ b/jietoulanqiu/h5/demo_2/res/3d/scene/Conventional/Assets/Demo/scene/textures/XN_di.jpg
--- a/jietoulanqiu/h5/demo_2/res/3d/scene/Conventional/Assets/Demo/scene/textures/XN_dimian.jpg
+++ b/jietoulanqiu/h5/demo_2/res/3d/scene/Conventional/Assets/Demo/scene/textures/XN_dimian.jpg
--- a/jietoulanqiu/h5/demo_2/res/3d/scene/Conventional/Assets/Demo/scene/textures/XN_guanzhong.png
+++ b/jietoulanqiu/h5/demo_2/res/3d/scene/Conventional/Assets/Demo/scene/textures/XN_guanzhong.png
--- a/jietoulanqiu/h5/demo_2/res/3d/scene/Conventional/Assets/Demo/scene/textures/XN_qiangmian.jpg
+++ b/jietoulanqiu/h5/demo_2/res/3d/scene/Conventional/Assets/Demo/scene/textures/XN_qiangmian.jpg
--- a/jietoulanqiu/h5/demo_2/res/3d/scene/Conventional/Assets/Demo/scene/textures/XN_qiuchang.jpg
+++ b/jietoulanqiu/h5/demo_2/res/3d/scene/Conventional/Assets/Demo/scene/textures/XN_qiuchang.jpg
--- a/jietoulanqiu/h5/demo_2/res/3d/scene/Conventional/Assets/Demo/scene/textures/XN_wujian.png
+++ b/jietoulanqiu/h5/demo_2/res/3d/scene/Conventional/Assets/Demo/scene/textures/XN_wujian.png
--- a/jietoulanqiu/h5/demo_2/res/3d/scene/Conventional/Assets/Demo/scene/textures/aiji_ding_Afternoon.png
+++ b/jietoulanqiu/h5/demo_2/res/3d/scene/Conventional/Assets/Demo/scene/textures/aiji_ding_Afternoon.png
--- a/jietoulanqiu/h5/demo_2/res/3d/scene/Conventional/Library/unity default resources-Cube.lm
+++ b/jietoulanqiu/h5/demo_2/res/3d/scene/Conventional/Library/unity default resources-Cube.lm
--- a/jietoulanqiu/h5/demo_2/res/3d/scene/Conventional/Resources/unity_builtin_extra.lmat
+++ b/jietoulanqiu/h5/demo_2/res/3d/scene/Conventional/Resources/unity_builtin_extra.lmat
--- a/jietoulanqiu/h5/demo_2/res/3d/scene/Conventional/Scene.ls
+++ b/jietoulanqiu/h5/demo_2/res/3d/scene/Conventional/Scene.ls
--- a/jietoulanqiu/h5/demo_2/res/ui/GameUI.fui
+++ b/jietoulanqiu/h5/demo_2/res/ui/GameUI.fui
--- a/jietoulanqiu/h5/demo_2/res/ui/GameUI_atlas0.png
+++ b/jietoulanqiu/h5/demo_2/res/ui/GameUI_atlas0.png
--- a/jietoulanqiu/h5/demo_2/texture.png
+++ b/jietoulanqiu/h5/demo_2/texture.png
--- a/jietoulanqiu/h5/demo_2/unpack.json
+++ b/jietoulanqiu/h5/demo_2/unpack.json
--- a/jietoulanqiu/h5/demo_2/version.json
+++ b/jietoulanqiu/h5/demo_2/version.json