Selaa lähdekoodia

生成瞄准线

zhaochengyang 5 vuotta sitten
vanhempi
commit
9b2b5138e4
75 muutettua tiedostoa jossa 2685 lisäystä ja 232 poistoa
  1. 5 0
      .rpt2_cache/rpt2_aa6a78127393d721c446959f54d3163589aa4031/code/cache/05c71cb8b2119efcbac2428ed83c6154efbfc3de
  2. 11 0
      .rpt2_cache/rpt2_aa6a78127393d721c446959f54d3163589aa4031/code/cache/1d26646c586fae9184b5c47594a24a45097fe6aa
  3. 5 0
      .rpt2_cache/rpt2_aa6a78127393d721c446959f54d3163589aa4031/code/cache/25d7591ab289f51ea28f943c596a4eaf902a5d96
  4. 8 0
      .rpt2_cache/rpt2_aa6a78127393d721c446959f54d3163589aa4031/code/cache/3ee2d3e497672a9fa27e940bb1da827b47a605c4
  5. 5 0
      .rpt2_cache/rpt2_aa6a78127393d721c446959f54d3163589aa4031/code/cache/4b04acffc5130412bc6f4b9c7831316777cbad49
  6. 9 0
      .rpt2_cache/rpt2_aa6a78127393d721c446959f54d3163589aa4031/code/cache/697233e78d2507679e23565b5b4877c4f32c6756
  7. 5 0
      .rpt2_cache/rpt2_aa6a78127393d721c446959f54d3163589aa4031/code/cache/7d94795dda8e891494bf167ffe1cdb35bd6ad0fd
  8. 9 0
      .rpt2_cache/rpt2_aa6a78127393d721c446959f54d3163589aa4031/code/cache/846e793b89e05a9ba0de48b773cd9b25b303587e
  9. 5 0
      .rpt2_cache/rpt2_aa6a78127393d721c446959f54d3163589aa4031/code/cache/84e0988369d84f0440d76986a78b45e5082a7a72
  10. 5 0
      .rpt2_cache/rpt2_aa6a78127393d721c446959f54d3163589aa4031/code/cache/8d543e7761be8d169d2e43ae3f2dd4fc636fe72a
  11. 9 0
      .rpt2_cache/rpt2_aa6a78127393d721c446959f54d3163589aa4031/code/cache/a6b3fa80111dddb09d26195e62351deeb578f173
  12. 8 0
      .rpt2_cache/rpt2_aa6a78127393d721c446959f54d3163589aa4031/code/cache/c7d96694f752a3c4a3964fc71bcb3118355e5d39
  13. 9 0
      .rpt2_cache/rpt2_aa6a78127393d721c446959f54d3163589aa4031/code/cache/d3ca8752c356f5a2b9c4987c690beba4590b73ed
  14. 8 0
      .rpt2_cache/rpt2_aa6a78127393d721c446959f54d3163589aa4031/code/cache/f9471b3a5ecac3c254c8d180a4cc8bc521659e48
  15. 9 0
      .rpt2_cache/rpt2_aa6a78127393d721c446959f54d3163589aa4031/code/cache/fb15da01784c62943031ed30c2d448a47e342f95
  16. 0 0
      .rpt2_cache/rpt2_aa6a78127393d721c446959f54d3163589aa4031/types/cache/452bd4bb32109b4a65edcb5ded468bb77224e985
  17. 0 0
      .rpt2_cache/rpt2_aa6a78127393d721c446959f54d3163589aa4031/types/cache/67ad2864f9baadfb27c911023c93cb542a046d77
  18. 0 0
      .rpt2_cache/rpt2_aa6a78127393d721c446959f54d3163589aa4031/types/cache/de6347ad07fb413be85f91215d95b7d2af4fd8b6
  19. 0 0
      .rpt2_cache/rpt2_aa6a78127393d721c446959f54d3163589aa4031/types/cache/ec22d91a4885b8854166e83dd2aaec81a83cb774
  20. 0 104
      bin/Game/res/Prop/LayaScene_Prop/Conventional/Archer.lh
  21. BIN
      bin/Game/res/Prop/LayaScene_Prop/Conventional/Assets/ArcherAsset/Mesh/Cube-Cube_0.lm
  22. BIN
      bin/Game/res/Prop/LayaScene_Prop/Conventional/Assets/ArcherAsset/Mesh/Cube-Cube_1.lm
  23. BIN
      bin/Game/res/Prop/LayaScene_Prop/Conventional/Assets/new_model/Cube-Cube_0.lm
  24. 75 0
      bin/Game/res/Prop/LayaScene_Prop/Conventional/Assets/new_model/Materials/Archer.lmat
  25. 4 4
      bin/Game/res/Prop/LayaScene_Prop/Conventional/Assets/ArcherAsset/Mesh/Materials/Cube_1Mat.lmat
  26. 75 0
      bin/Game/res/Prop/LayaScene_Prop/Conventional/Assets/new_model/Materials/Fence_Classic.lmat
  27. 4 4
      bin/Game/res/Prop/LayaScene_Prop/Conventional/Assets/ArcherAsset/Mesh/Materials/Cube_0Mat.lmat
  28. 75 0
      bin/Game/res/Prop/LayaScene_Prop/Conventional/Assets/new_model/Materials/Logs.lmat
  29. 58 0
      bin/Game/res/Prop/LayaScene_Prop/Conventional/Assets/new_model/Materials/Red.lmat
  30. 75 0
      bin/Game/res/Prop/LayaScene_Prop/Conventional/Assets/new_model/Materials/Stone.lmat
  31. 75 0
      bin/Game/res/Prop/LayaScene_Prop/Conventional/Assets/new_model/Materials/Tree-Beech.lmat
  32. 75 0
      bin/Game/res/Prop/LayaScene_Prop/Conventional/Assets/new_model/Materials/Tree_Bonsai.lmat
  33. 75 0
      bin/Game/res/Prop/LayaScene_Prop/Conventional/Assets/new_model/Materials/Tree_Lime.lmat
  34. 75 0
      bin/Game/res/Prop/LayaScene_Prop/Conventional/Assets/new_model/Materials/Tree_Oak.lmat
  35. 75 0
      bin/Game/res/Prop/LayaScene_Prop/Conventional/Assets/new_model/Materials/Wood_Metal.lmat
  36. 75 0
      bin/Game/res/Prop/LayaScene_Prop/Conventional/Assets/new_model/Materials/barrIcade_Tank.lmat
  37. BIN
      bin/Game/res/Prop/LayaScene_Prop/Conventional/Assets/new_model/barricade-tank-barricade-tank_0.lm
  38. BIN
      bin/Game/res/Prop/LayaScene_Prop/Conventional/Assets/new_model/fence-fence_0.lm
  39. BIN
      bin/Game/res/Prop/LayaScene_Prop/Conventional/Assets/new_model/fence_classic-fence_classic_0.lm
  40. BIN
      bin/Game/res/Prop/LayaScene_Prop/Conventional/Assets/new_model/logs-logs_0.lm
  41. BIN
      bin/Game/res/Prop/LayaScene_Prop/Conventional/Assets/new_model/stone-diamond-stone-diamond_0.lm
  42. BIN
      bin/Game/res/Prop/LayaScene_Prop/Conventional/Assets/new_model/stone-diamond_winter-stone-diamond_winter_0.lm
  43. BIN
      bin/Game/res/Prop/LayaScene_Prop/Conventional/Assets/new_model/stone-flat-stone-flat_0.lm
  44. BIN
      bin/Game/res/Prop/LayaScene_Prop/Conventional/Assets/new_model/stone-flat_winter-stone-flat_winter_0.lm
  45. BIN
      bin/Game/res/Prop/LayaScene_Prop/Conventional/Assets/new_model/stone-pointy-stone-pointy_0.lm
  46. BIN
      bin/Game/res/Prop/LayaScene_Prop/Conventional/Assets/new_model/stone-round-stone-round_0.lm
  47. BIN
      bin/Game/res/Prop/LayaScene_Prop/Conventional/Assets/new_model/stone-round_orange-stone-round_orange_0.lm
  48. BIN
      bin/Game/res/Prop/LayaScene_Prop/Conventional/Assets/new_model/stone-small-stone-small_0.lm
  49. BIN
      bin/Game/res/Prop/LayaScene_Prop/Conventional/Assets/new_model/stone-snow-stone-snow_0.lm
  50. BIN
      bin/Game/res/Prop/LayaScene_Prop/Conventional/Assets/new_model/tree-beech-tree-beech_0.lm
  51. BIN
      bin/Game/res/Prop/LayaScene_Prop/Conventional/Assets/new_model/tree-bonsai-tree-bonsai_0.lm
  52. BIN
      bin/Game/res/Prop/LayaScene_Prop/Conventional/Assets/new_model/tree-lime-tree-lime_0.lm
  53. BIN
      bin/Game/res/Prop/LayaScene_Prop/Conventional/Assets/new_model/tree-oak-tree-oak_0.lm
  54. BIN
      bin/Game/res/Prop/LayaScene_Prop/Conventional/Assets/new_model/wood_metal-wood_metal_0.lm
  55. BIN
      bin/Game/res/Prop/LayaScene_Prop/Conventional/Assets/textures/Cube_tex.jpg
  56. BIN
      bin/Game/res/Prop/LayaScene_Prop/Conventional/Assets/textures/barricade_tank_tex.jpg
  57. BIN
      bin/Game/res/Prop/LayaScene_Prop/Conventional/Assets/textures/fence_classic_tex.jpg
  58. BIN
      bin/Game/res/Prop/LayaScene_Prop/Conventional/Assets/textures/logs_tex.jpg
  59. BIN
      bin/Game/res/Prop/LayaScene_Prop/Conventional/Assets/textures/stone_tex.jpg
  60. BIN
      bin/Game/res/Prop/LayaScene_Prop/Conventional/Assets/textures/tree-beech_tex.jpg
  61. BIN
      bin/Game/res/Prop/LayaScene_Prop/Conventional/Assets/textures/tree_bonsai_tex.jpg
  62. BIN
      bin/Game/res/Prop/LayaScene_Prop/Conventional/Assets/textures/tree_lime_tex.jpg
  63. BIN
      bin/Game/res/Prop/LayaScene_Prop/Conventional/Assets/textures/tree_oak_tex.jpg
  64. BIN
      bin/Game/res/Prop/LayaScene_Prop/Conventional/Assets/textures/wood_metal_tex.jpg
  65. BIN
      bin/Game/res/Prop/LayaScene_Prop/Conventional/Library/unity default resources-Cylinder.lm
  66. 1480 0
      bin/Game/res/Prop/LayaScene_Prop/Conventional/Prop.lh
  67. 104 104
      bin/Game/res/Role/LayaScene_Role/Conventional/enemy.lh
  68. 28 0
      bin/Game/res/Role/LayaScene_Role/Conventional/player.lh
  69. 58 6
      bin/js/bundle.js
  70. 1 1
      bin/js/bundle.js.map
  71. 1 1
      bin/libs/laya.d3.js
  72. 19 2
      src/Game/GameManager.ts
  73. 1 1
      src/Game/Runner.ts
  74. 34 4
      src/Tools/AssetManager.ts
  75. 33 1
      src/View/LoadView.ts

Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 5 - 0
.rpt2_cache/rpt2_aa6a78127393d721c446959f54d3163589aa4031/code/cache/05c71cb8b2119efcbac2428ed83c6154efbfc3de


Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 11 - 0
.rpt2_cache/rpt2_aa6a78127393d721c446959f54d3163589aa4031/code/cache/1d26646c586fae9184b5c47594a24a45097fe6aa


Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 5 - 0
.rpt2_cache/rpt2_aa6a78127393d721c446959f54d3163589aa4031/code/cache/25d7591ab289f51ea28f943c596a4eaf902a5d96


Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 8 - 0
.rpt2_cache/rpt2_aa6a78127393d721c446959f54d3163589aa4031/code/cache/3ee2d3e497672a9fa27e940bb1da827b47a605c4


Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 5 - 0
.rpt2_cache/rpt2_aa6a78127393d721c446959f54d3163589aa4031/code/cache/4b04acffc5130412bc6f4b9c7831316777cbad49


Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 9 - 0
.rpt2_cache/rpt2_aa6a78127393d721c446959f54d3163589aa4031/code/cache/697233e78d2507679e23565b5b4877c4f32c6756


Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 5 - 0
.rpt2_cache/rpt2_aa6a78127393d721c446959f54d3163589aa4031/code/cache/7d94795dda8e891494bf167ffe1cdb35bd6ad0fd


Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 9 - 0
.rpt2_cache/rpt2_aa6a78127393d721c446959f54d3163589aa4031/code/cache/846e793b89e05a9ba0de48b773cd9b25b303587e


Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 5 - 0
.rpt2_cache/rpt2_aa6a78127393d721c446959f54d3163589aa4031/code/cache/84e0988369d84f0440d76986a78b45e5082a7a72


Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 5 - 0
.rpt2_cache/rpt2_aa6a78127393d721c446959f54d3163589aa4031/code/cache/8d543e7761be8d169d2e43ae3f2dd4fc636fe72a


Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 9 - 0
.rpt2_cache/rpt2_aa6a78127393d721c446959f54d3163589aa4031/code/cache/a6b3fa80111dddb09d26195e62351deeb578f173


Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 8 - 0
.rpt2_cache/rpt2_aa6a78127393d721c446959f54d3163589aa4031/code/cache/c7d96694f752a3c4a3964fc71bcb3118355e5d39


Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 9 - 0
.rpt2_cache/rpt2_aa6a78127393d721c446959f54d3163589aa4031/code/cache/d3ca8752c356f5a2b9c4987c690beba4590b73ed


Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 8 - 0
.rpt2_cache/rpt2_aa6a78127393d721c446959f54d3163589aa4031/code/cache/f9471b3a5ecac3c254c8d180a4cc8bc521659e48


Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 9 - 0
.rpt2_cache/rpt2_aa6a78127393d721c446959f54d3163589aa4031/code/cache/fb15da01784c62943031ed30c2d448a47e342f95


+ 0 - 0
.rpt2_cache/rpt2_aa6a78127393d721c446959f54d3163589aa4031/types/cache/452bd4bb32109b4a65edcb5ded468bb77224e985


+ 0 - 0
.rpt2_cache/rpt2_aa6a78127393d721c446959f54d3163589aa4031/types/cache/67ad2864f9baadfb27c911023c93cb542a046d77


+ 0 - 0
.rpt2_cache/rpt2_aa6a78127393d721c446959f54d3163589aa4031/types/cache/de6347ad07fb413be85f91215d95b7d2af4fd8b6


+ 0 - 0
.rpt2_cache/rpt2_aa6a78127393d721c446959f54d3163589aa4031/types/cache/ec22d91a4885b8854166e83dd2aaec81a83cb774


+ 0 - 104
bin/Game/res/Prop/LayaScene_Prop/Conventional/Archer.lh

@@ -1,104 +0,0 @@
-{
-	"version":"LAYAHIERARCHY:02",
-	"data":{
-		"type":"Sprite3D",
-		"instanceID":0,
-		"props":{
-			"name":"Archer",
-			"active":true,
-			"isStatic":false,
-			"layer":0,
-			"position":[
-				6.071703,
-				0.987067,
-				-3.724262
-			],
-			"rotation":[
-				0,
-				0,
-				0,
-				-1
-			],
-			"scale":[
-				20,
-				20,
-				20
-			]
-		},
-		"components":[],
-		"child":[
-			{
-				"type":"MeshSprite3D",
-				"instanceID":1,
-				"props":{
-					"name":"Cube_0",
-					"active":true,
-					"isStatic":false,
-					"layer":0,
-					"position":[
-						0,
-						0,
-						0
-					],
-					"rotation":[
-						0,
-						0,
-						0,
-						-1
-					],
-					"scale":[
-						1,
-						1,
-						1
-					],
-					"meshPath":"Assets/ArcherAsset/Mesh/Cube-Cube_0.lm",
-					"enableRender":true,
-					"materials":[
-						{
-							"type":"Laya.BlinnPhongMaterial",
-							"path":"Assets/ArcherAsset/Mesh/Materials/Cube_0Mat.lmat"
-						}
-					]
-				},
-				"components":[],
-				"child":[]
-			},
-			{
-				"type":"MeshSprite3D",
-				"instanceID":2,
-				"props":{
-					"name":"Cube_1",
-					"active":true,
-					"isStatic":false,
-					"layer":0,
-					"position":[
-						0,
-						0,
-						0
-					],
-					"rotation":[
-						0,
-						0,
-						0,
-						-1
-					],
-					"scale":[
-						1,
-						1,
-						1
-					],
-					"meshPath":"Assets/ArcherAsset/Mesh/Cube-Cube_1.lm",
-					"enableRender":true,
-					"materials":[
-						{
-							"type":"Laya.BlinnPhongMaterial",
-							"path":"Assets/ArcherAsset/Mesh/Materials/Cube_1Mat.lmat"
-						}
-					]
-				},
-				"components":[],
-				"child":[]
-			}
-		]
-	}
-}

BIN
bin/Game/res/Prop/LayaScene_Prop/Conventional/Assets/ArcherAsset/Mesh/Cube-Cube_0.lm


BIN
bin/Game/res/Prop/LayaScene_Prop/Conventional/Assets/ArcherAsset/Mesh/Cube-Cube_1.lm


BIN
bin/Game/res/Prop/LayaScene_Prop/Conventional/Assets/new_model/Cube-Cube_0.lm


+ 75 - 0
bin/Game/res/Prop/LayaScene_Prop/Conventional/Assets/new_model/Materials/Archer.lmat

@@ -0,0 +1,75 @@
+{
+	"version":"LAYAMATERIAL:02",
+	"props":{
+		"type":"Laya.BlinnPhongMaterial",
+		"name":"Archer",
+		"renderStates":[
+			{
+				"cull":2,
+				"blend":0,
+				"srcBlend":1,
+				"dstBlend":0,
+				"depthWrite":true,
+				"depthTest":515
+			}
+		],
+		"alphaTest":false,
+		"alphaTestValue":0.5,
+		"renderQueue":2000,
+		"metallic":0,
+		"smoothness":0.5,
+		"smoothnessTextureScale":1,
+		"smoothnessSource":0,
+		"normalTextureScale":1,
+		"parallaxTextureScale":0.02,
+		"occlusionTextureStrength":1,
+		"textures":[
+			{
+				"name":"albedoTexture",
+				"path":"../../textures/Cube_tex.jpg",
+				"constructParams":[
+					128,
+					128,
+					0,
+					true
+				],
+				"propertyParams":{
+					"filterMode":1,
+					"wrapModeU":0,
+					"wrapModeV":0,
+					"anisoLevel":1
+				}
+			}
+		],
+		"vectors":[
+			{
+				"name":"tilingOffset",
+				"value":[
+					1,
+					1,
+					0,
+					0
+				]
+			},
+			{
+				"name":"albedoColor",
+				"value":[
+					1,
+					1,
+					1,
+					1
+				]
+			},
+			{
+				"name":"emissionColor",
+				"value":[
+					0,
+					0,
+					0,
+					1
+				]
+			}
+		],
+		"defines":[]
+	}
+}

+ 4 - 4
bin/Game/res/Prop/LayaScene_Prop/Conventional/Assets/ArcherAsset/Mesh/Materials/Cube_1Mat.lmat

@@ -2,7 +2,7 @@
 	"version":"LAYAMATERIAL:02",
 	"props":{
 		"type":"Laya.BlinnPhongMaterial",
-		"name":"Cube_1Mat",
+		"name":"Blue",
 		"renderStates":[
 			{
 				"cull":2,
@@ -37,9 +37,9 @@
 			{
 				"name":"albedoColor",
 				"value":[
-					0.8,
-					0.8,
-					0.8,
+					0,
+					0.1675516,
+					1,
 					1
 				]
 			},

+ 75 - 0
bin/Game/res/Prop/LayaScene_Prop/Conventional/Assets/new_model/Materials/Fence_Classic.lmat

@@ -0,0 +1,75 @@
+{
+	"version":"LAYAMATERIAL:02",
+	"props":{
+		"type":"Laya.BlinnPhongMaterial",
+		"name":"Fence_Classic",
+		"renderStates":[
+			{
+				"cull":2,
+				"blend":0,
+				"srcBlend":1,
+				"dstBlend":0,
+				"depthWrite":true,
+				"depthTest":515
+			}
+		],
+		"alphaTest":false,
+		"alphaTestValue":0.5,
+		"renderQueue":2000,
+		"metallic":0,
+		"smoothness":0.5,
+		"smoothnessTextureScale":1,
+		"smoothnessSource":0,
+		"normalTextureScale":1,
+		"parallaxTextureScale":0.02,
+		"occlusionTextureStrength":1,
+		"textures":[
+			{
+				"name":"albedoTexture",
+				"path":"../../textures/fence_classic_tex.jpg",
+				"constructParams":[
+					128,
+					128,
+					0,
+					true
+				],
+				"propertyParams":{
+					"filterMode":1,
+					"wrapModeU":0,
+					"wrapModeV":0,
+					"anisoLevel":1
+				}
+			}
+		],
+		"vectors":[
+			{
+				"name":"tilingOffset",
+				"value":[
+					1,
+					1,
+					0,
+					0
+				]
+			},
+			{
+				"name":"albedoColor",
+				"value":[
+					1,
+					1,
+					1,
+					1
+				]
+			},
+			{
+				"name":"emissionColor",
+				"value":[
+					0,
+					0,
+					0,
+					1
+				]
+			}
+		],
+		"defines":[]
+	}
+}

+ 4 - 4
bin/Game/res/Prop/LayaScene_Prop/Conventional/Assets/ArcherAsset/Mesh/Materials/Cube_0Mat.lmat

@@ -2,7 +2,7 @@
 	"version":"LAYAMATERIAL:02",
 	"props":{
 		"type":"Laya.BlinnPhongMaterial",
-		"name":"Cube_0Mat",
+		"name":"Green",
 		"renderStates":[
 			{
 				"cull":2,
@@ -37,9 +37,9 @@
 			{
 				"name":"albedoColor",
 				"value":[
-					0.8,
-					0.8,
-					0.8,
+					0.06855918,
+					0.9926471,
+					0,
 					1
 				]
 			},

+ 75 - 0
bin/Game/res/Prop/LayaScene_Prop/Conventional/Assets/new_model/Materials/Logs.lmat

@@ -0,0 +1,75 @@
+{
+	"version":"LAYAMATERIAL:02",
+	"props":{
+		"type":"Laya.BlinnPhongMaterial",
+		"name":"Logs",
+		"renderStates":[
+			{
+				"cull":2,
+				"blend":0,
+				"srcBlend":1,
+				"dstBlend":0,
+				"depthWrite":true,
+				"depthTest":515
+			}
+		],
+		"alphaTest":false,
+		"alphaTestValue":0.5,
+		"renderQueue":2000,
+		"metallic":0,
+		"smoothness":0.5,
+		"smoothnessTextureScale":1,
+		"smoothnessSource":0,
+		"normalTextureScale":1,
+		"parallaxTextureScale":0.02,
+		"occlusionTextureStrength":1,
+		"textures":[
+			{
+				"name":"albedoTexture",
+				"path":"../../textures/logs_tex.jpg",
+				"constructParams":[
+					128,
+					128,
+					0,
+					true
+				],
+				"propertyParams":{
+					"filterMode":1,
+					"wrapModeU":0,
+					"wrapModeV":0,
+					"anisoLevel":1
+				}
+			}
+		],
+		"vectors":[
+			{
+				"name":"tilingOffset",
+				"value":[
+					1,
+					1,
+					0,
+					0
+				]
+			},
+			{
+				"name":"albedoColor",
+				"value":[
+					1,
+					1,
+					1,
+					1
+				]
+			},
+			{
+				"name":"emissionColor",
+				"value":[
+					0,
+					0,
+					0,
+					1
+				]
+			}
+		],
+		"defines":[]
+	}
+}

+ 58 - 0
bin/Game/res/Prop/LayaScene_Prop/Conventional/Assets/new_model/Materials/Red.lmat

@@ -0,0 +1,58 @@
+{
+	"version":"LAYAMATERIAL:02",
+	"props":{
+		"type":"Laya.BlinnPhongMaterial",
+		"name":"Red",
+		"renderStates":[
+			{
+				"cull":2,
+				"blend":0,
+				"srcBlend":1,
+				"dstBlend":0,
+				"depthWrite":true,
+				"depthTest":515
+			}
+		],
+		"alphaTest":false,
+		"alphaTestValue":0.5,
+		"renderQueue":2000,
+		"metallic":0,
+		"smoothness":0.5,
+		"smoothnessTextureScale":1,
+		"smoothnessSource":0,
+		"normalTextureScale":1,
+		"parallaxTextureScale":0.02,
+		"occlusionTextureStrength":1,
+		"textures":[],
+		"vectors":[
+			{
+				"name":"tilingOffset",
+				"value":[
+					1,
+					1,
+					0,
+					0
+				]
+			},
+			{
+				"name":"albedoColor",
+				"value":[
+					0.9926471,
+					0.02919553,
+					0.02919553,
+					1
+				]
+			},
+			{
+				"name":"emissionColor",
+				"value":[
+					0,
+					0,
+					0,
+					1
+				]
+			}
+		],
+		"defines":[]
+	}
+}

+ 75 - 0
bin/Game/res/Prop/LayaScene_Prop/Conventional/Assets/new_model/Materials/Stone.lmat

@@ -0,0 +1,75 @@
+{
+	"version":"LAYAMATERIAL:02",
+	"props":{
+		"type":"Laya.BlinnPhongMaterial",
+		"name":"Stone",
+		"renderStates":[
+			{
+				"cull":2,
+				"blend":0,
+				"srcBlend":1,
+				"dstBlend":0,
+				"depthWrite":true,
+				"depthTest":515
+			}
+		],
+		"alphaTest":false,
+		"alphaTestValue":0.5,
+		"renderQueue":2000,
+		"metallic":0,
+		"smoothness":0.5,
+		"smoothnessTextureScale":1,
+		"smoothnessSource":0,
+		"normalTextureScale":1,
+		"parallaxTextureScale":0.02,
+		"occlusionTextureStrength":1,
+		"textures":[
+			{
+				"name":"albedoTexture",
+				"path":"../../textures/stone_tex.jpg",
+				"constructParams":[
+					128,
+					128,
+					0,
+					true
+				],
+				"propertyParams":{
+					"filterMode":1,
+					"wrapModeU":0,
+					"wrapModeV":0,
+					"anisoLevel":1
+				}
+			}
+		],
+		"vectors":[
+			{
+				"name":"tilingOffset",
+				"value":[
+					1,
+					1,
+					0,
+					0
+				]
+			},
+			{
+				"name":"albedoColor",
+				"value":[
+					1,
+					1,
+					1,
+					1
+				]
+			},
+			{
+				"name":"emissionColor",
+				"value":[
+					0,
+					0,
+					0,
+					1
+				]
+			}
+		],
+		"defines":[]
+	}
+}

+ 75 - 0
bin/Game/res/Prop/LayaScene_Prop/Conventional/Assets/new_model/Materials/Tree-Beech.lmat

@@ -0,0 +1,75 @@
+{
+	"version":"LAYAMATERIAL:02",
+	"props":{
+		"type":"Laya.BlinnPhongMaterial",
+		"name":"Tree-Beech",
+		"renderStates":[
+			{
+				"cull":2,
+				"blend":0,
+				"srcBlend":1,
+				"dstBlend":0,
+				"depthWrite":true,
+				"depthTest":515
+			}
+		],
+		"alphaTest":false,
+		"alphaTestValue":0.5,
+		"renderQueue":2000,
+		"metallic":0,
+		"smoothness":0.5,
+		"smoothnessTextureScale":1,
+		"smoothnessSource":0,
+		"normalTextureScale":1,
+		"parallaxTextureScale":0.02,
+		"occlusionTextureStrength":1,
+		"textures":[
+			{
+				"name":"albedoTexture",
+				"path":"../../textures/tree-beech_tex.jpg",
+				"constructParams":[
+					128,
+					128,
+					0,
+					true
+				],
+				"propertyParams":{
+					"filterMode":1,
+					"wrapModeU":0,
+					"wrapModeV":0,
+					"anisoLevel":1
+				}
+			}
+		],
+		"vectors":[
+			{
+				"name":"tilingOffset",
+				"value":[
+					1,
+					1,
+					0,
+					0
+				]
+			},
+			{
+				"name":"albedoColor",
+				"value":[
+					1,
+					1,
+					1,
+					1
+				]
+			},
+			{
+				"name":"emissionColor",
+				"value":[
+					0,
+					0,
+					0,
+					1
+				]
+			}
+		],
+		"defines":[]
+	}
+}

+ 75 - 0
bin/Game/res/Prop/LayaScene_Prop/Conventional/Assets/new_model/Materials/Tree_Bonsai.lmat

@@ -0,0 +1,75 @@
+{
+	"version":"LAYAMATERIAL:02",
+	"props":{
+		"type":"Laya.BlinnPhongMaterial",
+		"name":"Tree_Bonsai",
+		"renderStates":[
+			{
+				"cull":2,
+				"blend":0,
+				"srcBlend":1,
+				"dstBlend":0,
+				"depthWrite":true,
+				"depthTest":515
+			}
+		],
+		"alphaTest":false,
+		"alphaTestValue":0.5,
+		"renderQueue":2000,
+		"metallic":0,
+		"smoothness":0.5,
+		"smoothnessTextureScale":1,
+		"smoothnessSource":0,
+		"normalTextureScale":1,
+		"parallaxTextureScale":0.02,
+		"occlusionTextureStrength":1,
+		"textures":[
+			{
+				"name":"albedoTexture",
+				"path":"../../textures/tree_bonsai_tex.jpg",
+				"constructParams":[
+					128,
+					128,
+					0,
+					true
+				],
+				"propertyParams":{
+					"filterMode":1,
+					"wrapModeU":0,
+					"wrapModeV":0,
+					"anisoLevel":1
+				}
+			}
+		],
+		"vectors":[
+			{
+				"name":"tilingOffset",
+				"value":[
+					1,
+					1,
+					0,
+					0
+				]
+			},
+			{
+				"name":"albedoColor",
+				"value":[
+					1,
+					1,
+					1,
+					1
+				]
+			},
+			{
+				"name":"emissionColor",
+				"value":[
+					0,
+					0,
+					0,
+					1
+				]
+			}
+		],
+		"defines":[]
+	}
+}

+ 75 - 0
bin/Game/res/Prop/LayaScene_Prop/Conventional/Assets/new_model/Materials/Tree_Lime.lmat

@@ -0,0 +1,75 @@
+{
+	"version":"LAYAMATERIAL:02",
+	"props":{
+		"type":"Laya.BlinnPhongMaterial",
+		"name":"Tree_Lime",
+		"renderStates":[
+			{
+				"cull":2,
+				"blend":0,
+				"srcBlend":1,
+				"dstBlend":0,
+				"depthWrite":true,
+				"depthTest":515
+			}
+		],
+		"alphaTest":false,
+		"alphaTestValue":0.5,
+		"renderQueue":2000,
+		"metallic":0,
+		"smoothness":0.5,
+		"smoothnessTextureScale":1,
+		"smoothnessSource":0,
+		"normalTextureScale":1,
+		"parallaxTextureScale":0.02,
+		"occlusionTextureStrength":1,
+		"textures":[
+			{
+				"name":"albedoTexture",
+				"path":"../../textures/tree_lime_tex.jpg",
+				"constructParams":[
+					128,
+					128,
+					0,
+					true
+				],
+				"propertyParams":{
+					"filterMode":1,
+					"wrapModeU":0,
+					"wrapModeV":0,
+					"anisoLevel":1
+				}
+			}
+		],
+		"vectors":[
+			{
+				"name":"tilingOffset",
+				"value":[
+					1,
+					1,
+					0,
+					0
+				]
+			},
+			{
+				"name":"albedoColor",
+				"value":[
+					1,
+					1,
+					1,
+					1
+				]
+			},
+			{
+				"name":"emissionColor",
+				"value":[
+					0,
+					0,
+					0,
+					1
+				]
+			}
+		],
+		"defines":[]
+	}
+}

+ 75 - 0
bin/Game/res/Prop/LayaScene_Prop/Conventional/Assets/new_model/Materials/Tree_Oak.lmat

@@ -0,0 +1,75 @@
+{
+	"version":"LAYAMATERIAL:02",
+	"props":{
+		"type":"Laya.BlinnPhongMaterial",
+		"name":"Tree_Oak",
+		"renderStates":[
+			{
+				"cull":2,
+				"blend":0,
+				"srcBlend":1,
+				"dstBlend":0,
+				"depthWrite":true,
+				"depthTest":515
+			}
+		],
+		"alphaTest":false,
+		"alphaTestValue":0.5,
+		"renderQueue":2000,
+		"metallic":0,
+		"smoothness":0.5,
+		"smoothnessTextureScale":1,
+		"smoothnessSource":0,
+		"normalTextureScale":1,
+		"parallaxTextureScale":0.02,
+		"occlusionTextureStrength":1,
+		"textures":[
+			{
+				"name":"albedoTexture",
+				"path":"../../textures/tree_oak_tex.jpg",
+				"constructParams":[
+					128,
+					128,
+					0,
+					true
+				],
+				"propertyParams":{
+					"filterMode":1,
+					"wrapModeU":0,
+					"wrapModeV":0,
+					"anisoLevel":1
+				}
+			}
+		],
+		"vectors":[
+			{
+				"name":"tilingOffset",
+				"value":[
+					1,
+					1,
+					0,
+					0
+				]
+			},
+			{
+				"name":"albedoColor",
+				"value":[
+					1,
+					1,
+					1,
+					1
+				]
+			},
+			{
+				"name":"emissionColor",
+				"value":[
+					0,
+					0,
+					0,
+					1
+				]
+			}
+		],
+		"defines":[]
+	}
+}

+ 75 - 0
bin/Game/res/Prop/LayaScene_Prop/Conventional/Assets/new_model/Materials/Wood_Metal.lmat

@@ -0,0 +1,75 @@
+{
+	"version":"LAYAMATERIAL:02",
+	"props":{
+		"type":"Laya.BlinnPhongMaterial",
+		"name":"Wood_Metal",
+		"renderStates":[
+			{
+				"cull":2,
+				"blend":0,
+				"srcBlend":1,
+				"dstBlend":0,
+				"depthWrite":true,
+				"depthTest":515
+			}
+		],
+		"alphaTest":false,
+		"alphaTestValue":0.5,
+		"renderQueue":2000,
+		"metallic":0,
+		"smoothness":0.5,
+		"smoothnessTextureScale":1,
+		"smoothnessSource":0,
+		"normalTextureScale":1,
+		"parallaxTextureScale":0.02,
+		"occlusionTextureStrength":1,
+		"textures":[
+			{
+				"name":"albedoTexture",
+				"path":"../../textures/wood_metal_tex.jpg",
+				"constructParams":[
+					128,
+					128,
+					0,
+					true
+				],
+				"propertyParams":{
+					"filterMode":1,
+					"wrapModeU":0,
+					"wrapModeV":0,
+					"anisoLevel":1
+				}
+			}
+		],
+		"vectors":[
+			{
+				"name":"tilingOffset",
+				"value":[
+					1,
+					1,
+					0,
+					0
+				]
+			},
+			{
+				"name":"albedoColor",
+				"value":[
+					1,
+					1,
+					1,
+					1
+				]
+			},
+			{
+				"name":"emissionColor",
+				"value":[
+					0,
+					0,
+					0,
+					1
+				]
+			}
+		],
+		"defines":[]
+	}
+}

+ 75 - 0
bin/Game/res/Prop/LayaScene_Prop/Conventional/Assets/new_model/Materials/barrIcade_Tank.lmat

@@ -0,0 +1,75 @@
+{
+	"version":"LAYAMATERIAL:02",
+	"props":{
+		"type":"Laya.BlinnPhongMaterial",
+		"name":"barrIcade_Tank",
+		"renderStates":[
+			{
+				"cull":2,
+				"blend":0,
+				"srcBlend":1,
+				"dstBlend":0,
+				"depthWrite":true,
+				"depthTest":515
+			}
+		],
+		"alphaTest":false,
+		"alphaTestValue":0.5,
+		"renderQueue":2000,
+		"metallic":0,
+		"smoothness":0.5,
+		"smoothnessTextureScale":1,
+		"smoothnessSource":0,
+		"normalTextureScale":1,
+		"parallaxTextureScale":0.02,
+		"occlusionTextureStrength":1,
+		"textures":[
+			{
+				"name":"albedoTexture",
+				"path":"../../textures/barricade_tank_tex.jpg",
+				"constructParams":[
+					128,
+					128,
+					0,
+					true
+				],
+				"propertyParams":{
+					"filterMode":1,
+					"wrapModeU":0,
+					"wrapModeV":0,
+					"anisoLevel":1
+				}
+			}
+		],
+		"vectors":[
+			{
+				"name":"tilingOffset",
+				"value":[
+					1,
+					1,
+					0,
+					0
+				]
+			},
+			{
+				"name":"albedoColor",
+				"value":[
+					1,
+					1,
+					1,
+					1
+				]
+			},
+			{
+				"name":"emissionColor",
+				"value":[
+					0,
+					0,
+					0,
+					1
+				]
+			}
+		],
+		"defines":[]
+	}
+}

BIN
bin/Game/res/Prop/LayaScene_Prop/Conventional/Assets/new_model/barricade-tank-barricade-tank_0.lm


BIN
bin/Game/res/Prop/LayaScene_Prop/Conventional/Assets/new_model/fence-fence_0.lm


BIN
bin/Game/res/Prop/LayaScene_Prop/Conventional/Assets/new_model/fence_classic-fence_classic_0.lm


BIN
bin/Game/res/Prop/LayaScene_Prop/Conventional/Assets/new_model/logs-logs_0.lm


BIN
bin/Game/res/Prop/LayaScene_Prop/Conventional/Assets/new_model/stone-diamond-stone-diamond_0.lm


BIN
bin/Game/res/Prop/LayaScene_Prop/Conventional/Assets/new_model/stone-diamond_winter-stone-diamond_winter_0.lm


BIN
bin/Game/res/Prop/LayaScene_Prop/Conventional/Assets/new_model/stone-flat-stone-flat_0.lm


BIN
bin/Game/res/Prop/LayaScene_Prop/Conventional/Assets/new_model/stone-flat_winter-stone-flat_winter_0.lm


BIN
bin/Game/res/Prop/LayaScene_Prop/Conventional/Assets/new_model/stone-pointy-stone-pointy_0.lm


BIN
bin/Game/res/Prop/LayaScene_Prop/Conventional/Assets/new_model/stone-round-stone-round_0.lm


BIN
bin/Game/res/Prop/LayaScene_Prop/Conventional/Assets/new_model/stone-round_orange-stone-round_orange_0.lm


BIN
bin/Game/res/Prop/LayaScene_Prop/Conventional/Assets/new_model/stone-small-stone-small_0.lm


BIN
bin/Game/res/Prop/LayaScene_Prop/Conventional/Assets/new_model/stone-snow-stone-snow_0.lm


BIN
bin/Game/res/Prop/LayaScene_Prop/Conventional/Assets/new_model/tree-beech-tree-beech_0.lm


BIN
bin/Game/res/Prop/LayaScene_Prop/Conventional/Assets/new_model/tree-bonsai-tree-bonsai_0.lm


BIN
bin/Game/res/Prop/LayaScene_Prop/Conventional/Assets/new_model/tree-lime-tree-lime_0.lm


BIN
bin/Game/res/Prop/LayaScene_Prop/Conventional/Assets/new_model/tree-oak-tree-oak_0.lm


BIN
bin/Game/res/Prop/LayaScene_Prop/Conventional/Assets/new_model/wood_metal-wood_metal_0.lm


BIN
bin/Game/res/Prop/LayaScene_Prop/Conventional/Assets/textures/Cube_tex.jpg


BIN
bin/Game/res/Prop/LayaScene_Prop/Conventional/Assets/textures/barricade_tank_tex.jpg


BIN
bin/Game/res/Prop/LayaScene_Prop/Conventional/Assets/textures/fence_classic_tex.jpg


BIN
bin/Game/res/Prop/LayaScene_Prop/Conventional/Assets/textures/logs_tex.jpg


BIN
bin/Game/res/Prop/LayaScene_Prop/Conventional/Assets/textures/stone_tex.jpg


BIN
bin/Game/res/Prop/LayaScene_Prop/Conventional/Assets/textures/tree-beech_tex.jpg


BIN
bin/Game/res/Prop/LayaScene_Prop/Conventional/Assets/textures/tree_bonsai_tex.jpg


BIN
bin/Game/res/Prop/LayaScene_Prop/Conventional/Assets/textures/tree_lime_tex.jpg


BIN
bin/Game/res/Prop/LayaScene_Prop/Conventional/Assets/textures/tree_oak_tex.jpg


BIN
bin/Game/res/Prop/LayaScene_Prop/Conventional/Assets/textures/wood_metal_tex.jpg


BIN
bin/Game/res/Prop/LayaScene_Prop/Conventional/Library/unity default resources-Cylinder.lm


Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 1480 - 0
bin/Game/res/Prop/LayaScene_Prop/Conventional/Prop.lh


+ 104 - 104
bin/Game/res/Role/LayaScene_Role/Conventional/enemy.lh

@@ -2,7 +2,7 @@
 	"version":"LAYAHIERARCHY:02",
 	"data":{
 		"type":"Sprite3D",
-		"instanceID":129,
+		"instanceID":130,
 		"props":{
 			"name":"enemy",
 			"active":true,
@@ -36,7 +36,7 @@
 		"child":[
 			{
 				"type":"Sprite3D",
-				"instanceID":130,
+				"instanceID":131,
 				"props":{
 					"name":"Ragdoll",
 					"active":true,
@@ -63,7 +63,7 @@
 				"child":[
 					{
 						"type":"Sprite3D",
-						"instanceID":131,
+						"instanceID":132,
 						"props":{
 							"name":"Bip001",
 							"active":true,
@@ -90,7 +90,7 @@
 						"child":[
 							{
 								"type":"Sprite3D",
-								"instanceID":132,
+								"instanceID":133,
 								"props":{
 									"name":"Bip001 Footsteps",
 									"active":true,
@@ -118,7 +118,7 @@
 							},
 							{
 								"type":"Sprite3D",
-								"instanceID":133,
+								"instanceID":134,
 								"props":{
 									"name":"Bip001 Pelvis",
 									"active":true,
@@ -145,7 +145,7 @@
 								"child":[
 									{
 										"type":"Sprite3D",
-										"instanceID":134,
+										"instanceID":135,
 										"props":{
 											"name":"Bip001 Spine",
 											"active":true,
@@ -172,7 +172,7 @@
 										"child":[
 											{
 												"type":"Sprite3D",
-												"instanceID":135,
+												"instanceID":136,
 												"props":{
 													"name":"Bip001 L Thigh",
 													"active":true,
@@ -199,7 +199,7 @@
 												"child":[
 													{
 														"type":"Sprite3D",
-														"instanceID":136,
+														"instanceID":137,
 														"props":{
 															"name":"Bip001 L Calf",
 															"active":true,
@@ -226,7 +226,7 @@
 														"child":[
 															{
 																"type":"Sprite3D",
-																"instanceID":137,
+																"instanceID":138,
 																"props":{
 																	"name":"Bip001 L Foot",
 																	"active":true,
@@ -253,7 +253,7 @@
 																"child":[
 																	{
 																		"type":"Sprite3D",
-																		"instanceID":138,
+																		"instanceID":139,
 																		"props":{
 																			"name":"Bip001 L Toe0",
 																			"active":true,
@@ -280,7 +280,7 @@
 																		"child":[
 																			{
 																				"type":"Sprite3D",
-																				"instanceID":139,
+																				"instanceID":140,
 																				"props":{
 																					"name":"Bip001 L Toe0Nub",
 																					"active":true,
@@ -316,7 +316,7 @@
 											},
 											{
 												"type":"Sprite3D",
-												"instanceID":140,
+												"instanceID":141,
 												"props":{
 													"name":"Bip001 R Thigh",
 													"active":true,
@@ -343,7 +343,7 @@
 												"child":[
 													{
 														"type":"Sprite3D",
-														"instanceID":141,
+														"instanceID":142,
 														"props":{
 															"name":"Bip001 R Calf",
 															"active":true,
@@ -370,7 +370,7 @@
 														"child":[
 															{
 																"type":"Sprite3D",
-																"instanceID":142,
+																"instanceID":143,
 																"props":{
 																	"name":"Bip001 R Foot",
 																	"active":true,
@@ -397,7 +397,7 @@
 																"child":[
 																	{
 																		"type":"Sprite3D",
-																		"instanceID":143,
+																		"instanceID":144,
 																		"props":{
 																			"name":"Bip001 R Toe0",
 																			"active":true,
@@ -424,7 +424,7 @@
 																		"child":[
 																			{
 																				"type":"Sprite3D",
-																				"instanceID":144,
+																				"instanceID":145,
 																				"props":{
 																					"name":"Bip001 R Toe0Nub",
 																					"active":true,
@@ -460,7 +460,7 @@
 											},
 											{
 												"type":"Sprite3D",
-												"instanceID":145,
+												"instanceID":146,
 												"props":{
 													"name":"Bip001 Spine1",
 													"active":true,
@@ -487,7 +487,7 @@
 												"child":[
 													{
 														"type":"Sprite3D",
-														"instanceID":146,
+														"instanceID":147,
 														"props":{
 															"name":"Bip001 Spine2",
 															"active":true,
@@ -514,7 +514,7 @@
 														"child":[
 															{
 																"type":"Sprite3D",
-																"instanceID":147,
+																"instanceID":148,
 																"props":{
 																	"name":"Bip001 Neck",
 																	"active":true,
@@ -541,7 +541,7 @@
 																"child":[
 																	{
 																		"type":"Sprite3D",
-																		"instanceID":148,
+																		"instanceID":149,
 																		"props":{
 																			"name":"Bip001 Head",
 																			"active":true,
@@ -568,7 +568,7 @@
 																		"child":[
 																			{
 																				"type":"Sprite3D",
-																				"instanceID":149,
+																				"instanceID":150,
 																				"props":{
 																					"name":"Bip001 HeadNub",
 																					"active":true,
@@ -598,7 +598,7 @@
 																	},
 																	{
 																		"type":"Sprite3D",
-																		"instanceID":150,
+																		"instanceID":151,
 																		"props":{
 																			"name":"Bip001 L Clavicle",
 																			"active":true,
@@ -625,7 +625,7 @@
 																		"child":[
 																			{
 																				"type":"Sprite3D",
-																				"instanceID":151,
+																				"instanceID":152,
 																				"props":{
 																					"name":"Bip001 L UpperArm",
 																					"active":true,
@@ -652,7 +652,7 @@
 																				"child":[
 																					{
 																						"type":"Sprite3D",
-																						"instanceID":152,
+																						"instanceID":153,
 																						"props":{
 																							"name":"Bip001 L Forearm",
 																							"active":true,
@@ -679,7 +679,7 @@
 																						"child":[
 																							{
 																								"type":"Sprite3D",
-																								"instanceID":153,
+																								"instanceID":154,
 																								"props":{
 																									"name":"Bip001 L Hand",
 																									"active":true,
@@ -706,7 +706,7 @@
 																								"child":[
 																									{
 																										"type":"Sprite3D",
-																										"instanceID":154,
+																										"instanceID":155,
 																										"props":{
 																											"name":"Bip001 L Finger0",
 																											"active":true,
@@ -733,7 +733,7 @@
 																										"child":[
 																											{
 																												"type":"Sprite3D",
-																												"instanceID":155,
+																												"instanceID":156,
 																												"props":{
 																													"name":"Bip001 L Finger01",
 																													"active":true,
@@ -760,7 +760,7 @@
 																												"child":[
 																													{
 																														"type":"Sprite3D",
-																														"instanceID":156,
+																														"instanceID":157,
 																														"props":{
 																															"name":"Bip001 L Finger02",
 																															"active":true,
@@ -787,7 +787,7 @@
 																														"child":[
 																															{
 																																"type":"Sprite3D",
-																																"instanceID":157,
+																																"instanceID":158,
 																																"props":{
 																																	"name":"Bip001 L Finger0Nub",
 																																	"active":true,
@@ -821,7 +821,7 @@
 																									},
 																									{
 																										"type":"Sprite3D",
-																										"instanceID":158,
+																										"instanceID":159,
 																										"props":{
 																											"name":"Bip001 L Finger1",
 																											"active":true,
@@ -848,7 +848,7 @@
 																										"child":[
 																											{
 																												"type":"Sprite3D",
-																												"instanceID":159,
+																												"instanceID":160,
 																												"props":{
 																													"name":"Bip001 L Finger11",
 																													"active":true,
@@ -875,7 +875,7 @@
 																												"child":[
 																													{
 																														"type":"Sprite3D",
-																														"instanceID":160,
+																														"instanceID":161,
 																														"props":{
 																															"name":"Bip001 L Finger12",
 																															"active":true,
@@ -902,7 +902,7 @@
 																														"child":[
 																															{
 																																"type":"Sprite3D",
-																																"instanceID":161,
+																																"instanceID":162,
 																																"props":{
 																																	"name":"Bip001 L Finger1Nub",
 																																	"active":true,
@@ -936,7 +936,7 @@
 																									},
 																									{
 																										"type":"Sprite3D",
-																										"instanceID":162,
+																										"instanceID":163,
 																										"props":{
 																											"name":"Bip001 L Finger2",
 																											"active":true,
@@ -963,7 +963,7 @@
 																										"child":[
 																											{
 																												"type":"Sprite3D",
-																												"instanceID":163,
+																												"instanceID":164,
 																												"props":{
 																													"name":"Bip001 L Finger21",
 																													"active":true,
@@ -990,7 +990,7 @@
 																												"child":[
 																													{
 																														"type":"Sprite3D",
-																														"instanceID":164,
+																														"instanceID":165,
 																														"props":{
 																															"name":"Bip001 L Finger22",
 																															"active":true,
@@ -1017,7 +1017,7 @@
 																														"child":[
 																															{
 																																"type":"Sprite3D",
-																																"instanceID":165,
+																																"instanceID":166,
 																																"props":{
 																																	"name":"Bip001 L Finger2Nub",
 																																	"active":true,
@@ -1051,7 +1051,7 @@
 																									},
 																									{
 																										"type":"Sprite3D",
-																										"instanceID":166,
+																										"instanceID":167,
 																										"props":{
 																											"name":"Bip001 L Finger3",
 																											"active":true,
@@ -1078,7 +1078,7 @@
 																										"child":[
 																											{
 																												"type":"Sprite3D",
-																												"instanceID":167,
+																												"instanceID":168,
 																												"props":{
 																													"name":"Bip001 L Finger31",
 																													"active":true,
@@ -1105,7 +1105,7 @@
 																												"child":[
 																													{
 																														"type":"Sprite3D",
-																														"instanceID":168,
+																														"instanceID":169,
 																														"props":{
 																															"name":"Bip001 L Finger32",
 																															"active":true,
@@ -1132,7 +1132,7 @@
 																														"child":[
 																															{
 																																"type":"Sprite3D",
-																																"instanceID":169,
+																																"instanceID":170,
 																																"props":{
 																																	"name":"Bip001 L Finger3Nub",
 																																	"active":true,
@@ -1166,7 +1166,7 @@
 																									},
 																									{
 																										"type":"Sprite3D",
-																										"instanceID":170,
+																										"instanceID":171,
 																										"props":{
 																											"name":"Bip001 L Finger4",
 																											"active":true,
@@ -1193,7 +1193,7 @@
 																										"child":[
 																											{
 																												"type":"Sprite3D",
-																												"instanceID":171,
+																												"instanceID":172,
 																												"props":{
 																													"name":"Bip001 L Finger41",
 																													"active":true,
@@ -1220,7 +1220,7 @@
 																												"child":[
 																													{
 																														"type":"Sprite3D",
-																														"instanceID":172,
+																														"instanceID":173,
 																														"props":{
 																															"name":"Bip001 L Finger42",
 																															"active":true,
@@ -1247,7 +1247,7 @@
 																														"child":[
 																															{
 																																"type":"Sprite3D",
-																																"instanceID":173,
+																																"instanceID":174,
 																																"props":{
 																																	"name":"Bip001 L Finger4Nub",
 																																	"active":true,
@@ -1289,7 +1289,7 @@
 																	},
 																	{
 																		"type":"Sprite3D",
-																		"instanceID":174,
+																		"instanceID":175,
 																		"props":{
 																			"name":"Bip001 R Clavicle",
 																			"active":true,
@@ -1316,7 +1316,7 @@
 																		"child":[
 																			{
 																				"type":"Sprite3D",
-																				"instanceID":175,
+																				"instanceID":176,
 																				"props":{
 																					"name":"Bip001 R UpperArm",
 																					"active":true,
@@ -1343,7 +1343,7 @@
 																				"child":[
 																					{
 																						"type":"Sprite3D",
-																						"instanceID":176,
+																						"instanceID":177,
 																						"props":{
 																							"name":"Bip001 R Forearm",
 																							"active":true,
@@ -1370,7 +1370,7 @@
 																						"child":[
 																							{
 																								"type":"Sprite3D",
-																								"instanceID":177,
+																								"instanceID":178,
 																								"props":{
 																									"name":"Bip001 R Hand",
 																									"active":true,
@@ -1397,7 +1397,7 @@
 																								"child":[
 																									{
 																										"type":"Sprite3D",
-																										"instanceID":178,
+																										"instanceID":179,
 																										"props":{
 																											"name":"Bip001 R Finger0",
 																											"active":true,
@@ -1424,7 +1424,7 @@
 																										"child":[
 																											{
 																												"type":"Sprite3D",
-																												"instanceID":179,
+																												"instanceID":180,
 																												"props":{
 																													"name":"Bip001 R Finger01",
 																													"active":true,
@@ -1451,7 +1451,7 @@
 																												"child":[
 																													{
 																														"type":"Sprite3D",
-																														"instanceID":180,
+																														"instanceID":181,
 																														"props":{
 																															"name":"Bip001 R Finger02",
 																															"active":true,
@@ -1478,7 +1478,7 @@
 																														"child":[
 																															{
 																																"type":"Sprite3D",
-																																"instanceID":181,
+																																"instanceID":182,
 																																"props":{
 																																	"name":"Bip001 R Finger0Nub",
 																																	"active":true,
@@ -1512,7 +1512,7 @@
 																									},
 																									{
 																										"type":"Sprite3D",
-																										"instanceID":182,
+																										"instanceID":183,
 																										"props":{
 																											"name":"Bip001 R Finger1",
 																											"active":true,
@@ -1539,7 +1539,7 @@
 																										"child":[
 																											{
 																												"type":"Sprite3D",
-																												"instanceID":183,
+																												"instanceID":184,
 																												"props":{
 																													"name":"Bip001 R Finger11",
 																													"active":true,
@@ -1566,7 +1566,7 @@
 																												"child":[
 																													{
 																														"type":"Sprite3D",
-																														"instanceID":184,
+																														"instanceID":185,
 																														"props":{
 																															"name":"Bip001 R Finger12",
 																															"active":true,
@@ -1593,7 +1593,7 @@
 																														"child":[
 																															{
 																																"type":"Sprite3D",
-																																"instanceID":185,
+																																"instanceID":186,
 																																"props":{
 																																	"name":"Bip001 R Finger1Nub",
 																																	"active":true,
@@ -1627,7 +1627,7 @@
 																									},
 																									{
 																										"type":"Sprite3D",
-																										"instanceID":186,
+																										"instanceID":187,
 																										"props":{
 																											"name":"Bip001 R Finger2",
 																											"active":true,
@@ -1654,7 +1654,7 @@
 																										"child":[
 																											{
 																												"type":"Sprite3D",
-																												"instanceID":187,
+																												"instanceID":188,
 																												"props":{
 																													"name":"Bip001 R Finger21",
 																													"active":true,
@@ -1681,7 +1681,7 @@
 																												"child":[
 																													{
 																														"type":"Sprite3D",
-																														"instanceID":188,
+																														"instanceID":189,
 																														"props":{
 																															"name":"Bip001 R Finger22",
 																															"active":true,
@@ -1708,7 +1708,7 @@
 																														"child":[
 																															{
 																																"type":"Sprite3D",
-																																"instanceID":189,
+																																"instanceID":190,
 																																"props":{
 																																	"name":"Bip001 R Finger2Nub",
 																																	"active":true,
@@ -1742,7 +1742,7 @@
 																									},
 																									{
 																										"type":"Sprite3D",
-																										"instanceID":190,
+																										"instanceID":191,
 																										"props":{
 																											"name":"Bip001 R Finger3",
 																											"active":true,
@@ -1769,7 +1769,7 @@
 																										"child":[
 																											{
 																												"type":"Sprite3D",
-																												"instanceID":191,
+																												"instanceID":192,
 																												"props":{
 																													"name":"Bip001 R Finger31",
 																													"active":true,
@@ -1796,7 +1796,7 @@
 																												"child":[
 																													{
 																														"type":"Sprite3D",
-																														"instanceID":192,
+																														"instanceID":193,
 																														"props":{
 																															"name":"Bip001 R Finger32",
 																															"active":true,
@@ -1823,7 +1823,7 @@
 																														"child":[
 																															{
 																																"type":"Sprite3D",
-																																"instanceID":193,
+																																"instanceID":194,
 																																"props":{
 																																	"name":"Bip001 R Finger3Nub",
 																																	"active":true,
@@ -1857,7 +1857,7 @@
 																									},
 																									{
 																										"type":"Sprite3D",
-																										"instanceID":194,
+																										"instanceID":195,
 																										"props":{
 																											"name":"Bip001 R Finger4",
 																											"active":true,
@@ -1884,7 +1884,7 @@
 																										"child":[
 																											{
 																												"type":"Sprite3D",
-																												"instanceID":195,
+																												"instanceID":196,
 																												"props":{
 																													"name":"Bip001 R Finger41",
 																													"active":true,
@@ -1911,7 +1911,7 @@
 																												"child":[
 																													{
 																														"type":"Sprite3D",
-																														"instanceID":196,
+																														"instanceID":197,
 																														"props":{
 																															"name":"Bip001 R Finger42",
 																															"active":true,
@@ -1938,7 +1938,7 @@
 																														"child":[
 																															{
 																																"type":"Sprite3D",
-																																"instanceID":197,
+																																"instanceID":198,
 																																"props":{
 																																	"name":"Bip001 R Finger4Nub",
 																																	"active":true,
@@ -1992,7 +1992,7 @@
 					},
 					{
 						"type":"SkinnedMeshSprite3D",
-						"instanceID":198,
+						"instanceID":199,
 						"props":{
 							"name":"Whiteman",
 							"active":true,
@@ -2014,7 +2014,7 @@
 								1,
 								1
 							],
-							"rootBone":131,
+							"rootBone":132,
 							"boundBox":{
 								"min":[
 									-0.2197284,
@@ -2036,59 +2036,59 @@
 								"radius":0.9904873
 							},
 							"bones":[
-								148,
-								150,
+								149,
 								151,
-								134,
-								145,
+								152,
+								135,
 								146,
-								131,
 								147,
-								152,
+								132,
+								148,
 								153,
-								158,
-								162,
-								170,
-								166,
-								159,
-								167,
-								156,
 								154,
-								155,
-								171,
+								159,
 								163,
-								164,
-								168,
+								171,
+								167,
 								160,
+								168,
+								157,
+								155,
+								156,
 								172,
+								164,
+								165,
+								169,
+								161,
+								173,
+								137,
 								136,
-								135,
-								133,
-								140,
+								134,
 								141,
-								137,
 								142,
 								138,
 								143,
-								174,
+								139,
+								144,
 								175,
 								176,
 								177,
-								182,
-								186,
-								194,
-								190,
+								178,
 								183,
+								187,
+								195,
 								191,
-								179,
+								184,
+								192,
 								180,
-								178,
-								195,
-								187,
+								181,
+								179,
+								196,
 								188,
-								192,
-								184,
-								196
+								189,
+								193,
+								185,
+								197
 							],
 							"materials":[
 								{

+ 28 - 0
bin/Game/res/Role/LayaScene_Role/Conventional/player.lh

@@ -2151,6 +2151,34 @@
 						]
 					}
 				]
+			},
+			{
+				"type":"Sprite3D",
+				"instanceID":129,
+				"props":{
+					"name":"raypos",
+					"active":true,
+					"isStatic":false,
+					"layer":0,
+					"position":[
+						0,
+						0,
+						0
+					],
+					"rotation":[
+						0,
+						0,
+						0,
+						-1
+					],
+					"scale":[
+						1,
+						1,
+						1
+					]
+				},
+				"components":[],
+				"child":[]
 			}
 		]
 	}

+ 58 - 6
bin/js/bundle.js

@@ -294,6 +294,11 @@
             this.Enemy = new ResDic();
             this.Horse = new ResDic();
             this.Prop = new ResDic();
+            this.Stone = new ResDic();
+            this.Tree = new ResDic();
+            this.RedRay = new ResDic();
+            this.BlueRay = new ResDic();
+            this.GreenRay = new ResDic();
             AssetManager.ins = this;
             EventManager.EventOn(EventState.LoadComplete, this, this.Init);
         }
@@ -324,9 +329,7 @@
     ResourcesPath.Enemy = [
         "Game/res/Role/LayaScene_Role/Conventional/enemy.lh"
     ];
-    ResourcesPath.Prop = [
-        "Game/res/Prop/LayaScene_Prop/Conventional/Archer"
-    ];
+    ResourcesPath.Prop = "Game/res/Prop/LayaScene_Prop/Conventional/Prop.lh";
 
     var Sprite3D = Laya.Sprite3D;
     var Vector3 = Laya.Vector3;
@@ -455,7 +458,7 @@
         onAwake() {
             this.m_player = this.owner;
             this.m_animator = this.owner.getComponent(Laya.Animator);
-            this.m_horseanimator = this.owner.getChildAt(1).getComponent(Laya.Animator);
+            this.m_horseanimator = this.owner.getChildAt(2).getComponent(Laya.Animator);
             this.ChangeState(CharacterState.Idle);
             EventManager.StageOn(StageState.Start, this, this.Begin);
         }
@@ -464,6 +467,9 @@
             this.ChangeState(CharacterState.Run);
         }
         onUpdate() {
+            let ray = this.m_player.getChildByName("raypos");
+            console.log("玩家的位置---", this.m_player.transform.position);
+            console.log("ray的位置---", ray.transform.position);
             if (this.canmove) {
                 if (this._press) {
                     this._speed = 2;
@@ -862,6 +868,8 @@
             var playermodel = GamePool.Instance.GetModel(AssetManager.Instance.Player.get(1), "");
             var horsemodel = GamePool.Instance.GetModel(AssetManager.Instance.Horse.get(1), "");
             playermodel.addChild(horsemodel);
+            var raypos = playermodel.getChildByName("raypos");
+            this.CreatRay(raypos.transform.position.clone(), raypos.transform.rotationEuler.clone(), raypos);
             playermodel.transform.position = new Laya.Vector3(0, 0, 0);
             horsemodel.transform.localScale = new Laya.Vector3(1, 1, 1);
             horsemodel.transform.localPosition = new Laya.Vector3(0, 0, 0);
@@ -870,7 +878,19 @@
         }
         CreatEnemy() {
         }
-        EventListen() {
+        CreatRay(pos, euler, raypos) {
+            var ray = this.CreatRayPrefab();
+            raypos.addChild(ray);
+            ray.transform.position = pos;
+            ray.transform.rotationEuler = euler;
+            let scale = ray.transform.scale.clone();
+            scale.z = 5;
+            scale.x = 1;
+            ray.transform.scale = scale;
+        }
+        CreatRayPrefab() {
+            var ray = GamePool.Instance.GetModel(AssetManager.Instance.GreenRay.get(1), "");
+            return ray;
         }
     }
 
@@ -945,9 +965,41 @@
                     Laya.loader.clearRes(ResourcesPath.Horse[i]);
                 }
                 console.log("马模型资源加载完毕---");
-                this.LoadComplete();
+                this.LoadProp();
             }));
         }
+        LoadProp() {
+            Laya.loader.create(ResourcesPath.Prop, Laya.Handler.create(this, this.LoadResources));
+        }
+        LoadResources(_prop) {
+            var Prop = _prop.getChildByName("Prop");
+            for (let i = 0; i < Prop.numChildren; i++) {
+                var model = Prop.getChildAt(i);
+                model.active = false;
+                AssetManager.Instance.Prop.set(i + 1, model);
+            }
+            var Stone = _prop.getChildByName("Stone");
+            for (let i = 0; i < Stone.numChildren; i++) {
+                var stone = Stone.getChildAt(i);
+                stone.active = false;
+                AssetManager.Instance.Stone.set(i + 1, stone);
+            }
+            var Tree = _prop.getChildByName("Tree");
+            for (let i = 0; i < Tree.numChildren; i++) {
+                var tree = Tree.getChildAt(i);
+                tree.active = false;
+                AssetManager.Instance.Tree.set(i + 1, tree);
+            }
+            var Blue = _prop.getChildByName("bulletB");
+            AssetManager.Instance.BlueRay.set(1, Blue);
+            var Red = _prop.getChildByName("bulletR");
+            AssetManager.Instance.RedRay.set(1, Red);
+            var Green = _prop.getChildByName("bulletG");
+            AssetManager.Instance.GreenRay.set(1, Green);
+            Laya.loader.clearRes(ResourcesPath.Prop);
+            console.log("道具资源加载完毕---");
+            this.LoadComplete();
+        }
     }
 
     class Main {

Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 1 - 1
bin/js/bundle.js.map


+ 1 - 1
bin/libs/laya.d3.js

@@ -29059,7 +29059,7 @@
 	                (i == n - 1) ? defMask += mask[i] : defMask += mask[i] + ",";
 	            for (var i = 0, n = defineString.length; i < n; i++)
 	                (i == n - 1) ? defStr += defineString[i] : defStr += defineString[i] + ",";
-	            console.log("%cLayaAir: Shader Compile Information---ShaderName:" + this._owner._owner._name + " SubShaderIndex:" + this._owner._owner._subShaders.indexOf(this._owner) + " PassIndex:" + this._owner._passes.indexOf(this) + " DefineMask:[" + defMask + "]" + " DefineNames:[" + defStr + "]", "color:green");
+	            // console.log("%cLayaAir: Shader Compile Information---ShaderName:" + this._owner._owner._name + " SubShaderIndex:" + this._owner._owner._subShaders.indexOf(this._owner) + " PassIndex:" + this._owner._passes.indexOf(this) + " DefineMask:[" + defMask + "]" + " DefineNames:[" + defStr + "]", "color:green");
 	        }
 	        return shader;
 	    }

+ 19 - 2
src/Game/GameManager.ts

@@ -38,6 +38,10 @@ export class GameManager{
         var playermodel = GamePool.Instance.GetModel(AssetManager.Instance.Player.get(1),"");
         var horsemodel = GamePool.Instance.GetModel(AssetManager.Instance.Horse.get(1),"");
         playermodel.addChild(horsemodel);
+        var raypos = playermodel.getChildByName("raypos") as Laya.Sprite3D;
+
+        this.CreatRay(raypos.transform.position.clone(),raypos.transform.rotationEuler.clone(),raypos);
+
         playermodel.transform.position = new Laya.Vector3(0,0,0);
         horsemodel.transform.localScale = new  Laya.Vector3(1,1,1);
         horsemodel.transform.localPosition = new Laya.Vector3(0,0,0);
@@ -47,8 +51,21 @@ export class GameManager{
     CreatEnemy(){
         
     }
-    EventListen(){
-        
+    //创建瞄准线
+    CreatRay(pos:Laya.Vector3,euler:Laya.Vector3,raypos:Laya.Sprite3D){
+        var ray = this.CreatRayPrefab();
+        raypos.addChild(ray);
+        ray.transform.position = pos;
+        ray.transform.rotationEuler = euler;
+        let scale = ray.transform.scale.clone();
+        scale.z = 5;
+        scale.x = 1;
+        ray.transform.scale = scale;
     }
+    CreatRayPrefab():Laya.Sprite3D{
+        var ray = GamePool.Instance.GetModel(AssetManager.Instance.GreenRay.get(1),"");
+        return ray
+    }
+    
 
 }

+ 1 - 1
src/Game/Runner.ts

@@ -40,7 +40,7 @@ export class Runner extends Laya.Script3D{
     onAwake(){
         this.m_player = this.owner as Sprite3D;
         this.m_animator = this.owner.getComponent(Laya.Animator) as Laya.Animator;
-        this.m_horseanimator = this.owner.getChildAt(1).getComponent(Laya.Animator) as Laya.Animator;
+        this.m_horseanimator = this.owner.getChildAt(2).getComponent(Laya.Animator) as Laya.Animator;
         this.ChangeState(CharacterState.Idle);
 
         EventManager.StageOn(StageState.Start,this,this.Begin);

+ 34 - 4
src/Tools/AssetManager.ts

@@ -18,6 +18,16 @@ export class AssetManager{
     public Horse:ResDic = new ResDic();
     //道具
     public Prop:ResDic = new ResDic();
+    //石头
+    public Stone:ResDic = new ResDic();
+    //树
+    public Tree:ResDic = new ResDic();
+    //红色射线
+    public RedRay:ResDic = new ResDic();
+    //蓝色射线
+    public BlueRay:ResDic = new ResDic();
+    //绿色射线
+    public GreenRay:ResDic = new ResDic();
 
     constructor(){
         AssetManager.ins = this;
@@ -52,8 +62,28 @@ export class ResourcesPath{
     [
         "Game/res/Role/LayaScene_Role/Conventional/enemy.lh"
     ]
-    static Prop = 
-    [
-        "Game/res/Prop/LayaScene_Prop/Conventional/Archer"
-    ]
+    static Prop = "Game/res/Prop/LayaScene_Prop/Conventional/Prop.lh";
+    // static Prop = 
+    // {
+    //     1:"Game/res/Prop/LayaScene_Prop/Conventional/Archer.lh",//弓
+    //     2:"Game/res/Prop/LayaScene_Prop/Conventional/Arrow.lh",//箭
+    //     3:"Game/res/Prop/LayaScene_Prop/Conventional/big_fence.lh",//大栅栏
+    //     4:"Game/res/Prop/LayaScene_Prop/Conventional/small_fence.lh",//小栅栏
+    //     5:"Game/res/Prop/LayaScene_Prop/Conventional/bonfire.lh",//火堆
+    //     6:"Game/res/Prop/LayaScene_Prop/Conventional/stone1.lh",//石头
+    //     7:"Game/res/Prop/LayaScene_Prop/Conventional/stone2.lh",
+    //     8:"Game/res/Prop/LayaScene_Prop/Conventional/stone3.lh",
+    //     9:"Game/res/Prop/LayaScene_Prop/Conventional/stone4.lh",
+    //     10:"Game/res/Prop/LayaScene_Prop/Conventional/stone5.lh",
+    //     11:"Game/res/Prop/LayaScene_Prop/Conventional/stone6.lh",
+    //     12:"Game/res/Prop/LayaScene_Prop/Conventional/stone7.lh",
+    //     13:"Game/res/Prop/LayaScene_Prop/Conventional/stone8.lh",
+    //     14:"Game/res/Prop/LayaScene_Prop/Conventional/stone9.lh",
+    //     15:"Game/res/Prop/LayaScene_Prop/Conventional/tree1.lh",//树
+    //     16:"Game/res/Prop/LayaScene_Prop/Conventional/tree2.lh",
+    //     17:"Game/res/Prop/LayaScene_Prop/Conventional/tree3.lh",
+    //     18:"Game/res/Prop/LayaScene_Prop/Conventional/tree4.lh",
+    //     19:"Game/res/Prop/LayaScene_Prop/Conventional/wood_Cylinder.lh",//圆木堆
+    // }
+        
 }

+ 33 - 1
src/View/LoadView.ts

@@ -78,8 +78,40 @@ export class LoadView{
                 Laya.loader.clearRes(ResourcesPath.Horse[i]);
             }
             console.log("马模型资源加载完毕---");
-            this.LoadComplete();
+            this.LoadProp();
         }))
     }
+    LoadProp(){
+        Laya.loader.create(ResourcesPath.Prop,Laya.Handler.create(this,this.LoadResources))
+    }
+    LoadResources(_prop:Laya.Sprite3D){
+        var Prop = _prop.getChildByName("Prop") ;
+        for (let i = 0; i < Prop.numChildren; i++) {
+            var model = Prop.getChildAt(i) as Laya.Sprite3D;
+            model.active = false;
+            AssetManager.Instance.Prop.set(i+1,model);
+        }
+        var Stone = _prop.getChildByName("Stone") ;
+        for (let i = 0; i < Stone.numChildren; i++) {
+            var stone = Stone.getChildAt(i) as Laya.Sprite3D;
+            stone.active = false;
+            AssetManager.Instance.Stone.set(i+1,stone);
+        }
+        var Tree = _prop.getChildByName("Tree") ;
+        for (let i = 0; i < Tree.numChildren; i++) {
+            var tree = Tree.getChildAt(i) as Laya.Sprite3D;
+            tree.active = false;
+            AssetManager.Instance.Tree.set(i+1,tree);
+        }
+        var Blue = _prop.getChildByName("bulletB") as Laya.Sprite3D;
+        AssetManager.Instance.BlueRay.set(1,Blue);
+        var Red = _prop.getChildByName("bulletR") as Laya.Sprite3D;
+        AssetManager.Instance.RedRay.set(1,Red);
+        var Green = _prop.getChildByName("bulletG") as Laya.Sprite3D;
+        AssetManager.Instance.GreenRay.set(1,Green);
+        Laya.loader.clearRes(ResourcesPath.Prop);
+        console.log("道具资源加载完毕---");
+        this.LoadComplete();
+    }
 
 }