zhaochengyang 5 лет назад
Родитель
Сommit
e53747b865
78 измененных файлов с 1034 добавлено и 579 удалено
  1. 1 1
      .laya/wxgame.json
  2. 390 11
      bin/js/bundle.js
  3. 1 1
      bin/project.config.json
  4. BIN
      bin/res/character/Conventional/Assets/Models/StickMan-Stickman.lm
  5. 2 2
      bin/res/character/Conventional/Assets/Models/StickMan-role_1-StickManAvatar.lav
  6. BIN
      bin/res/character/Conventional/Assets/Models/box-Box001.lm
  7. BIN
      bin/res/character/Conventional/Assets/Models/cc/Astronaut-Astronaut.lm
  8. 2 2
      bin/res/character/Conventional/Assets/Models/cc/Astronaut-role_9-AstronautAvatar.lav
  9. BIN
      bin/res/character/Conventional/Assets/Models/cc/Basketer-Basketer.lm
  10. BIN
      bin/res/character/Conventional/Assets/Models/cc/Captain-Captain.lm
  11. BIN
      bin/res/character/Conventional/Assets/Models/cc/Chef-Chef.lm
  12. BIN
      bin/res/character/Conventional/Assets/Models/cc/Grapher-Grapher.lm
  13. BIN
      bin/res/character/Conventional/Assets/Models/cc/Joker-Joker.lm
  14. BIN
      bin/res/character/Conventional/Assets/Models/cc/Suitman-Suitman.lm
  15. BIN
      bin/res/character/Conventional/Assets/Models/cc/Warrior-Warrior.lm
  16. BIN
      bin/res/character/Conventional/Assets/Models/jiantou-Plane001.lm
  17. 6 33
      bin/res/character/Conventional/Assets/Scenes/Materials/character_mat/Gray_emiss.lmat
  18. 6 16
      bin/res/character/Conventional/Assets/Scenes/Materials/character_mat/Green_emiss.lmat
  19. 5 15
      bin/res/character/Conventional/Assets/Scenes/Materials/character_mat/blue_emiss.lmat
  20. 6 33
      bin/res/character/Conventional/Assets/Scenes/Materials/character_mat/faint_purple.lmat
  21. 6 33
      bin/res/character/Conventional/Assets/Scenes/Materials/character_mat/faint_red_emiss.lmat
  22. 6 16
      bin/res/character/Conventional/Assets/Scenes/Materials/character_mat/orange_emiss.lmat
  23. 4 14
      bin/res/character/Conventional/Assets/Scenes/Materials/character_mat/orange_red_emiss.lmat
  24. 4 14
      bin/res/character/Conventional/Assets/Scenes/Materials/character_mat/purple_emiss.lmat
  25. 6 33
      bin/res/character/Conventional/Assets/Scenes/Materials/character_mat/red_emiss.lmat
  26. 3 30
      bin/res/character/Conventional/Assets/Scenes/Materials/character_mat/white_emiss.lmat
  27. 6 33
      bin/res/character/Conventional/Assets/Scenes/Materials/character_mat/yellow_emiss.lmat
  28. 5 5
      bin/res/character/Conventional/Directional Light.lh
  29. BIN
      bin/res/character/ui/main.bin
  30. BIN
      bin/res/character/ui/main_atlas0.png
  31. BIN
      bin/res/skinicon/1.png
  32. BIN
      bin/res/skinicon/2.png
  33. BIN
      bin/res/skinicon/3.png
  34. BIN
      bin/res/skinicon/4.png
  35. BIN
      bin/res/skinicon/5.png
  36. BIN
      bin/res/skinicon/6.png
  37. BIN
      bin/res/skinicon/7.png
  38. BIN
      bin/res/skinicon/8.png
  39. BIN
      bin/res/skinicon/9.png
  40. 1 1
      release/wxgame/js/bundle.js
  41. 1 1
      release/wxgame/project.config.json
  42. BIN
      release/wxgame/res/character/Conventional/Assets/Models/StickMan-Stickman.lm
  43. 2 2
      release/wxgame/res/character/Conventional/Assets/Models/StickMan-role_1-StickManAvatar.lav
  44. BIN
      release/wxgame/res/character/Conventional/Assets/Models/box-Box001.lm
  45. BIN
      release/wxgame/res/character/Conventional/Assets/Models/cc/Astronaut-Astronaut.lm
  46. 2 2
      release/wxgame/res/character/Conventional/Assets/Models/cc/Astronaut-role_9-AstronautAvatar.lav
  47. BIN
      release/wxgame/res/character/Conventional/Assets/Models/cc/Basketer-Basketer.lm
  48. BIN
      release/wxgame/res/character/Conventional/Assets/Models/cc/Captain-Captain.lm
  49. BIN
      release/wxgame/res/character/Conventional/Assets/Models/cc/Chef-Chef.lm
  50. BIN
      release/wxgame/res/character/Conventional/Assets/Models/cc/Grapher-Grapher.lm
  51. BIN
      release/wxgame/res/character/Conventional/Assets/Models/cc/Joker-Joker.lm
  52. BIN
      release/wxgame/res/character/Conventional/Assets/Models/cc/Suitman-Suitman.lm
  53. BIN
      release/wxgame/res/character/Conventional/Assets/Models/cc/Warrior-Warrior.lm
  54. BIN
      release/wxgame/res/character/Conventional/Assets/Models/jiantou-Plane001.lm
  55. 6 33
      release/wxgame/res/character/Conventional/Assets/Scenes/Materials/character_mat/Gray_emiss.lmat
  56. 6 16
      release/wxgame/res/character/Conventional/Assets/Scenes/Materials/character_mat/Green_emiss.lmat
  57. 5 15
      release/wxgame/res/character/Conventional/Assets/Scenes/Materials/character_mat/blue_emiss.lmat
  58. 6 33
      release/wxgame/res/character/Conventional/Assets/Scenes/Materials/character_mat/faint_purple.lmat
  59. 6 33
      release/wxgame/res/character/Conventional/Assets/Scenes/Materials/character_mat/faint_red_emiss.lmat
  60. 6 16
      release/wxgame/res/character/Conventional/Assets/Scenes/Materials/character_mat/orange_emiss.lmat
  61. 4 14
      release/wxgame/res/character/Conventional/Assets/Scenes/Materials/character_mat/orange_red_emiss.lmat
  62. 4 14
      release/wxgame/res/character/Conventional/Assets/Scenes/Materials/character_mat/purple_emiss.lmat
  63. 6 33
      release/wxgame/res/character/Conventional/Assets/Scenes/Materials/character_mat/red_emiss.lmat
  64. 3 30
      release/wxgame/res/character/Conventional/Assets/Scenes/Materials/character_mat/white_emiss.lmat
  65. 6 33
      release/wxgame/res/character/Conventional/Assets/Scenes/Materials/character_mat/yellow_emiss.lmat
  66. 5 5
      release/wxgame/res/character/Conventional/Directional Light.lh
  67. BIN
      release/wxgame/res/character/ui/main.bin
  68. BIN
      release/wxgame/res/character/ui/main_atlas0.png
  69. BIN
      release/wxgame/resources/ui/loading.bin
  70. BIN
      release/wxgame/resources/ui/loading_atlas0.png
  71. 4 0
      src/Agency/AgencyInGame.ts
  72. 4 1
      src/Agency/AgencySkin.ts
  73. 3 0
      src/Control/SceneControl.ts
  74. 4 0
      src/Push/CpaDownsView.ts
  75. 65 0
      src/View/CompletePanel.ts
  76. 402 1
      src/View/MainPanel.ts
  77. 18 4
      src/WXSDK/PlayerAccount.ts
  78. 6 0
      src/utils/GameState.ts

+ 1 - 1
.laya/wxgame.json

@@ -70,7 +70,7 @@
     "forceCompile": false,
     "onlyIndexJS": true,
     "projectType": "ts",
-    "pubTime": 1590495482805,
+    "pubTime": 1591018620979,
     "uesEnginePlugin": false,
     "wxOptimize": {
         "useOptimizeOpen": false,

Разница между файлами не показана из-за своего большого размера
+ 390 - 11
bin/js/bundle.js


+ 1 - 1
bin/project.config.json

@@ -9,7 +9,7 @@
 	},
 	"compileType": "game",
 	"libVersion": "game",
-	"appid": "tt057a73c79a504a3c",
+	"appid": "tt66d0106df9eaa083",
 	"projectname": "跑酷",
 	"condition": {
 		"search": {

BIN
bin/res/character/Conventional/Assets/Models/StickMan-Stickman.lm


+ 2 - 2
bin/res/character/Conventional/Assets/Models/StickMan-role_1-StickManAvatar.lav

@@ -4,7 +4,7 @@
 		"props":{
 			"name":"role_1",
 			"translate":[
-				0,
+				-0.05,
 				-0.5,
 				0
 			],
@@ -776,7 +776,7 @@
 				"props":{
 					"name":"Stickman",
 					"translate":[
-						-0.001785,
+						0,
 						0,
 						0
 					],

BIN
bin/res/character/Conventional/Assets/Models/box-Box001.lm


BIN
bin/res/character/Conventional/Assets/Models/cc/Astronaut-Astronaut.lm


+ 2 - 2
bin/res/character/Conventional/Assets/Models/cc/Astronaut-role_9-AstronautAvatar.lav

@@ -4,9 +4,9 @@
 		"props":{
 			"name":"role_9",
 			"translate":[
-				-0.03075013,
+				0,
 				-0.5,
-				-0.008270738
+				0
 			],
 			"rotation":[
 				0,

BIN
bin/res/character/Conventional/Assets/Models/cc/Basketer-Basketer.lm


BIN
bin/res/character/Conventional/Assets/Models/cc/Captain-Captain.lm


BIN
bin/res/character/Conventional/Assets/Models/cc/Chef-Chef.lm


BIN
bin/res/character/Conventional/Assets/Models/cc/Grapher-Grapher.lm


BIN
bin/res/character/Conventional/Assets/Models/cc/Joker-Joker.lm


BIN
bin/res/character/Conventional/Assets/Models/cc/Suitman-Suitman.lm


BIN
bin/res/character/Conventional/Assets/Models/cc/Warrior-Warrior.lm


BIN
bin/res/character/Conventional/Assets/Models/jiantou-Plane001.lm


+ 6 - 33
bin/res/character/Conventional/Assets/Scenes/Materials/character_mat/Gray_emiss.lmat

@@ -1,7 +1,7 @@
 {
 	"version":"LAYAMATERIAL:02",
 	"props":{
-		"type":"Laya.BlinnPhongMaterial",
+		"type":"Laya.UnlitMaterial",
 		"name":"Gray_emiss",
 		"renderStates":[
 			{
@@ -17,27 +17,8 @@
 		"alphaTest":false,
 		"alphaTestValue":0.5,
 		"renderQueue":2000,
-		"albedoIntensity":4,
-		"enableLighting":true,
-		"shininess":1,
-		"textures":[
-			{
-				"name":"normalTexture",
-				"path":"Normal.jpg",
-				"constructParams":[
-					128,
-					128,
-					0,
-					true
-				],
-				"propertyParams":{
-					"filterMode":1,
-					"wrapModeU":0,
-					"wrapModeV":0,
-					"anisoLevel":1
-				}
-			}
-		],
+		"albedoIntensity":1.81,
+		"textures":[],
 		"vectors":[
 			{
 				"name":"tilingOffset",
@@ -49,19 +30,11 @@
 				]
 			},
 			{
-				"name":"specularColor",
-				"value":[
-					1,
-					1,
-					1
-				]
-			},
-			{
 				"name":"albedoColor",
 				"value":[
-					0.1037736,
-					0.07587221,
-					0.07587221,
+					0.0754717,
+					0.00747597,
+					0.00747597,
 					1
 				]
 			}

+ 6 - 16
bin/res/character/Conventional/Assets/Scenes/Materials/character_mat/Green_emiss.lmat

@@ -1,11 +1,11 @@
 {
 	"version":"LAYAMATERIAL:02",
 	"props":{
-		"type":"Laya.BlinnPhongMaterial",
+		"type":"Laya.UnlitMaterial",
 		"name":"Green_emiss",
 		"renderStates":[
 			{
-				"cull":0,
+				"cull":2,
 				"blend":0,
 				"srcBlend":1,
 				"dstBlend":0,
@@ -17,9 +17,7 @@
 		"alphaTest":false,
 		"alphaTestValue":0.5,
 		"renderQueue":2000,
-		"albedoIntensity":4,
-		"enableLighting":true,
-		"shininess":0.01,
+		"albedoIntensity":1,
 		"textures":[],
 		"vectors":[
 			{
@@ -32,19 +30,11 @@
 				]
 			},
 			{
-				"name":"specularColor",
-				"value":[
-					0,
-					0,
-					0
-				]
-			},
-			{
 				"name":"albedoColor",
 				"value":[
-					0.254902,
-					0.5019608,
-					0.2862745,
+					0,
+					1,
+					0.1821904,
 					1
 				]
 			}

+ 5 - 15
bin/res/character/Conventional/Assets/Scenes/Materials/character_mat/blue_emiss.lmat

@@ -1,7 +1,7 @@
 {
 	"version":"LAYAMATERIAL:02",
 	"props":{
-		"type":"Laya.BlinnPhongMaterial",
+		"type":"Laya.UnlitMaterial",
 		"name":"blue_emiss",
 		"renderStates":[
 			{
@@ -17,9 +17,7 @@
 		"alphaTest":false,
 		"alphaTestValue":0.5,
 		"renderQueue":2000,
-		"albedoIntensity":4,
-		"enableLighting":true,
-		"shininess":0.01,
+		"albedoIntensity":1.71,
 		"textures":[],
 		"vectors":[
 			{
@@ -32,19 +30,11 @@
 				]
 			},
 			{
-				"name":"specularColor",
-				"value":[
-					0,
-					0,
-					0
-				]
-			},
-			{
 				"name":"albedoColor",
 				"value":[
-					0.1321645,
-					0.2528907,
-					0.509434,
+					0,
+					0.4077673,
+					1,
 					1
 				]
 			}

+ 6 - 33
bin/res/character/Conventional/Assets/Scenes/Materials/character_mat/faint_purple.lmat

@@ -1,7 +1,7 @@
 {
 	"version":"LAYAMATERIAL:02",
 	"props":{
-		"type":"Laya.BlinnPhongMaterial",
+		"type":"Laya.UnlitMaterial",
 		"name":"faint_purple",
 		"renderStates":[
 			{
@@ -17,27 +17,8 @@
 		"alphaTest":false,
 		"alphaTestValue":0.5,
 		"renderQueue":2000,
-		"albedoIntensity":4,
-		"enableLighting":true,
-		"shininess":1,
-		"textures":[
-			{
-				"name":"normalTexture",
-				"path":"Normal.jpg",
-				"constructParams":[
-					128,
-					128,
-					0,
-					true
-				],
-				"propertyParams":{
-					"filterMode":1,
-					"wrapModeU":0,
-					"wrapModeV":0,
-					"anisoLevel":1
-				}
-			}
-		],
+		"albedoIntensity":1.33,
+		"textures":[],
 		"vectors":[
 			{
 				"name":"tilingOffset",
@@ -49,19 +30,11 @@
 				]
 			},
 			{
-				"name":"specularColor",
-				"value":[
-					0.5,
-					0.5,
-					0.5
-				]
-			},
-			{
 				"name":"albedoColor",
 				"value":[
-					0.1974457,
-					0.2101356,
-					0.2735849,
+					0.6901961,
+					0.6627451,
+					0.7333333,
 					1
 				]
 			}

+ 6 - 33
bin/res/character/Conventional/Assets/Scenes/Materials/character_mat/faint_red_emiss.lmat

@@ -1,7 +1,7 @@
 {
 	"version":"LAYAMATERIAL:02",
 	"props":{
-		"type":"Laya.BlinnPhongMaterial",
+		"type":"Laya.UnlitMaterial",
 		"name":"faint_red_emiss",
 		"renderStates":[
 			{
@@ -17,27 +17,8 @@
 		"alphaTest":false,
 		"alphaTestValue":0.5,
 		"renderQueue":2000,
-		"albedoIntensity":4,
-		"enableLighting":true,
-		"shininess":0.078125,
-		"textures":[
-			{
-				"name":"normalTexture",
-				"path":"Normal.jpg",
-				"constructParams":[
-					128,
-					128,
-					0,
-					true
-				],
-				"propertyParams":{
-					"filterMode":1,
-					"wrapModeU":0,
-					"wrapModeV":0,
-					"anisoLevel":1
-				}
-			}
-		],
+		"albedoIntensity":1.1,
+		"textures":[],
 		"vectors":[
 			{
 				"name":"tilingOffset",
@@ -49,19 +30,11 @@
 				]
 			},
 			{
-				"name":"specularColor",
-				"value":[
-					0.5,
-					0.5,
-					0.5
-				]
-			},
-			{
 				"name":"albedoColor",
 				"value":[
-					1,
-					0.844951,
-					0.6650944,
+					0.9811321,
+					0.7544912,
+					0.7080812,
 					1
 				]
 			}

+ 6 - 16
bin/res/character/Conventional/Assets/Scenes/Materials/character_mat/orange_emiss.lmat

@@ -1,11 +1,11 @@
 {
 	"version":"LAYAMATERIAL:02",
 	"props":{
-		"type":"Laya.BlinnPhongMaterial",
+		"type":"Laya.UnlitMaterial",
 		"name":"orange_emiss",
 		"renderStates":[
 			{
-				"cull":0,
+				"cull":2,
 				"blend":0,
 				"srcBlend":1,
 				"dstBlend":0,
@@ -17,9 +17,7 @@
 		"alphaTest":true,
 		"alphaTestValue":0,
 		"renderQueue":2450,
-		"albedoIntensity":4,
-		"enableLighting":true,
-		"shininess":0.01,
+		"albedoIntensity":1.3,
 		"textures":[],
 		"vectors":[
 			{
@@ -32,19 +30,11 @@
 				]
 			},
 			{
-				"name":"specularColor",
-				"value":[
-					0,
-					0,
-					0
-				]
-			},
-			{
 				"name":"albedoColor",
 				"value":[
-					0.6037736,
-					0.1437587,
-					0.01423994,
+					1,
+					0.7198543,
+					0,
 					1
 				]
 			}

+ 4 - 14
bin/res/character/Conventional/Assets/Scenes/Materials/character_mat/orange_red_emiss.lmat

@@ -1,7 +1,7 @@
 {
 	"version":"LAYAMATERIAL:02",
 	"props":{
-		"type":"Laya.BlinnPhongMaterial",
+		"type":"Laya.UnlitMaterial",
 		"name":"orange_red_emiss",
 		"renderStates":[
 			{
@@ -17,9 +17,7 @@
 		"alphaTest":false,
 		"alphaTestValue":0.5,
 		"renderQueue":2000,
-		"albedoIntensity":4,
-		"enableLighting":true,
-		"shininess":0.01,
+		"albedoIntensity":1.5,
 		"textures":[],
 		"vectors":[
 			{
@@ -32,18 +30,10 @@
 				]
 			},
 			{
-				"name":"specularColor",
-				"value":[
-					0,
-					0,
-					0
-				]
-			},
-			{
 				"name":"albedoColor",
 				"value":[
-					1,
-					0.08880375,
+					0.882353,
+					0.2666667,
 					0,
 					1
 				]

+ 4 - 14
bin/res/character/Conventional/Assets/Scenes/Materials/character_mat/purple_emiss.lmat

@@ -1,7 +1,7 @@
 {
 	"version":"LAYAMATERIAL:02",
 	"props":{
-		"type":"Laya.BlinnPhongMaterial",
+		"type":"Laya.UnlitMaterial",
 		"name":"purple_emiss",
 		"renderStates":[
 			{
@@ -17,9 +17,7 @@
 		"alphaTest":false,
 		"alphaTestValue":0.5,
 		"renderQueue":2000,
-		"albedoIntensity":4,
-		"enableLighting":true,
-		"shininess":0.01,
+		"albedoIntensity":1,
 		"textures":[],
 		"vectors":[
 			{
@@ -32,19 +30,11 @@
 				]
 			},
 			{
-				"name":"specularColor",
-				"value":[
-					0,
-					0,
-					0
-				]
-			},
-			{
 				"name":"albedoColor",
 				"value":[
-					0.4739905,
+					1,
 					0,
-					0.9056604,
+					0.9267902,
 					1
 				]
 			}

+ 6 - 33
bin/res/character/Conventional/Assets/Scenes/Materials/character_mat/red_emiss.lmat

@@ -1,7 +1,7 @@
 {
 	"version":"LAYAMATERIAL:02",
 	"props":{
-		"type":"Laya.BlinnPhongMaterial",
+		"type":"Laya.UnlitMaterial",
 		"name":"red_emiss",
 		"renderStates":[
 			{
@@ -17,27 +17,8 @@
 		"alphaTest":false,
 		"alphaTestValue":0.5,
 		"renderQueue":2000,
-		"albedoIntensity":4,
-		"enableLighting":true,
-		"shininess":1,
-		"textures":[
-			{
-				"name":"normalTexture",
-				"path":"Normal.jpg",
-				"constructParams":[
-					128,
-					128,
-					0,
-					true
-				],
-				"propertyParams":{
-					"filterMode":1,
-					"wrapModeU":0,
-					"wrapModeV":0,
-					"anisoLevel":1
-				}
-			}
-		],
+		"albedoIntensity":1.36,
+		"textures":[],
 		"vectors":[
 			{
 				"name":"tilingOffset",
@@ -49,19 +30,11 @@
 				]
 			},
 			{
-				"name":"specularColor",
-				"value":[
-					1,
-					1,
-					1
-				]
-			},
-			{
 				"name":"albedoColor",
 				"value":[
-					0.3773585,
-					0.05495728,
-					0.008899963,
+					1,
+					0,
+					0,
 					1
 				]
 			}

+ 3 - 30
bin/res/character/Conventional/Assets/Scenes/Materials/character_mat/white_emiss.lmat

@@ -1,7 +1,7 @@
 {
 	"version":"LAYAMATERIAL:02",
 	"props":{
-		"type":"Laya.BlinnPhongMaterial",
+		"type":"Laya.UnlitMaterial",
 		"name":"white_emiss",
 		"renderStates":[
 			{
@@ -17,27 +17,8 @@
 		"alphaTest":false,
 		"alphaTestValue":0.5,
 		"renderQueue":2000,
-		"albedoIntensity":2.35,
-		"enableLighting":true,
-		"shininess":1,
-		"textures":[
-			{
-				"name":"normalTexture",
-				"path":"Normal.jpg",
-				"constructParams":[
-					128,
-					128,
-					0,
-					true
-				],
-				"propertyParams":{
-					"filterMode":1,
-					"wrapModeU":0,
-					"wrapModeV":0,
-					"anisoLevel":1
-				}
-			}
-		],
+		"albedoIntensity":1,
+		"textures":[],
 		"vectors":[
 			{
 				"name":"tilingOffset",
@@ -49,14 +30,6 @@
 				]
 			},
 			{
-				"name":"specularColor",
-				"value":[
-					1,
-					1,
-					1
-				]
-			},
-			{
 				"name":"albedoColor",
 				"value":[
 					1,

+ 6 - 33
bin/res/character/Conventional/Assets/Scenes/Materials/character_mat/yellow_emiss.lmat

@@ -1,7 +1,7 @@
 {
 	"version":"LAYAMATERIAL:02",
 	"props":{
-		"type":"Laya.BlinnPhongMaterial",
+		"type":"Laya.UnlitMaterial",
 		"name":"yellow_emiss",
 		"renderStates":[
 			{
@@ -14,30 +14,11 @@
 			}
 		],
 		"enableVertexColor":false,
-		"alphaTest":false,
+		"alphaTest":true,
 		"alphaTestValue":0.5,
-		"renderQueue":2000,
-		"albedoIntensity":4,
-		"enableLighting":true,
-		"shininess":0.01,
-		"textures":[
-			{
-				"name":"normalTexture",
-				"path":"Normal.jpg",
-				"constructParams":[
-					128,
-					128,
-					0,
-					true
-				],
-				"propertyParams":{
-					"filterMode":1,
-					"wrapModeU":0,
-					"wrapModeV":0,
-					"anisoLevel":1
-				}
-			}
-		],
+		"renderQueue":2450,
+		"albedoIntensity":1.31,
+		"textures":[],
 		"vectors":[
 			{
 				"name":"tilingOffset",
@@ -49,18 +30,10 @@
 				]
 			},
 			{
-				"name":"specularColor",
-				"value":[
-					0,
-					0,
-					0
-				]
-			},
-			{
 				"name":"albedoColor",
 				"value":[
 					1,
-					0.8268979,
+					0.6679427,
 					0,
 					1
 				]

+ 5 - 5
bin/res/character/Conventional/Directional Light.lh

@@ -13,17 +13,17 @@
 				0
 			],
 			"rotation":[
-				0.3535534,
-				0.3535534,
-				0.1464466,
-				-0.8535535
+				-0.1665902,
+				0.2386972,
+				0.9557931,
+				-0.04160379
 			],
 			"scale":[
 				1,
 				1,
 				1
 			],
-			"intensity":0.5,
+			"intensity":0.8,
 			"lightmapBakedType":0,
 			"color":[
 				1,

BIN
bin/res/character/ui/main.bin


BIN
bin/res/character/ui/main_atlas0.png


BIN
bin/res/skinicon/1.png


BIN
bin/res/skinicon/2.png


BIN
bin/res/skinicon/3.png


BIN
bin/res/skinicon/4.png


BIN
bin/res/skinicon/5.png


BIN
bin/res/skinicon/6.png


BIN
bin/res/skinicon/7.png


BIN
bin/res/skinicon/8.png


BIN
bin/res/skinicon/9.png


Разница между файлами не показана из-за своего большого размера
+ 1 - 1
release/wxgame/js/bundle.js


+ 1 - 1
release/wxgame/project.config.json

@@ -1 +1 @@
-{"description":"项目配置文件。","setting":{"urlCheck":false,"es6":false,"postcss":true,"minified":false,"newFeature":true},"compileType":"game","libVersion":"game","appid":"tt057a73c79a504a3c","projectname":"跑酷","condition":{"search":{"current":-1,"list":[]},"conversation":{"current":-1,"list":[]},"game":{"currentL":-1,"list":[]},"miniprogram":{"current":-1,"list":[]}}}
+{"description":"项目配置文件。","setting":{"urlCheck":false,"es6":false,"postcss":true,"minified":false,"newFeature":true},"compileType":"game","libVersion":"game","appid":"tt66d0106df9eaa083","projectname":"跑酷","condition":{"search":{"current":-1,"list":[]},"conversation":{"current":-1,"list":[]},"game":{"currentL":-1,"list":[]},"miniprogram":{"current":-1,"list":[]}}}

BIN
release/wxgame/res/character/Conventional/Assets/Models/StickMan-Stickman.lm


+ 2 - 2
release/wxgame/res/character/Conventional/Assets/Models/StickMan-role_1-StickManAvatar.lav

@@ -4,7 +4,7 @@
 		"props":{
 			"name":"role_1",
 			"translate":[
-				0,
+				-0.05,
 				-0.5,
 				0
 			],
@@ -776,7 +776,7 @@
 				"props":{
 					"name":"Stickman",
 					"translate":[
-						-0.001785,
+						0,
 						0,
 						0
 					],

BIN
release/wxgame/res/character/Conventional/Assets/Models/box-Box001.lm


BIN
release/wxgame/res/character/Conventional/Assets/Models/cc/Astronaut-Astronaut.lm


+ 2 - 2
release/wxgame/res/character/Conventional/Assets/Models/cc/Astronaut-role_9-AstronautAvatar.lav

@@ -4,9 +4,9 @@
 		"props":{
 			"name":"role_9",
 			"translate":[
-				-0.03075013,
+				0,
 				-0.5,
-				-0.008270738
+				0
 			],
 			"rotation":[
 				0,

BIN
release/wxgame/res/character/Conventional/Assets/Models/cc/Basketer-Basketer.lm


BIN
release/wxgame/res/character/Conventional/Assets/Models/cc/Captain-Captain.lm


BIN
release/wxgame/res/character/Conventional/Assets/Models/cc/Chef-Chef.lm


BIN
release/wxgame/res/character/Conventional/Assets/Models/cc/Grapher-Grapher.lm


BIN
release/wxgame/res/character/Conventional/Assets/Models/cc/Joker-Joker.lm


BIN
release/wxgame/res/character/Conventional/Assets/Models/cc/Suitman-Suitman.lm


BIN
release/wxgame/res/character/Conventional/Assets/Models/cc/Warrior-Warrior.lm


BIN
release/wxgame/res/character/Conventional/Assets/Models/jiantou-Plane001.lm


+ 6 - 33
release/wxgame/res/character/Conventional/Assets/Scenes/Materials/character_mat/Gray_emiss.lmat

@@ -1,7 +1,7 @@
 {
 	"version":"LAYAMATERIAL:02",
 	"props":{
-		"type":"Laya.BlinnPhongMaterial",
+		"type":"Laya.UnlitMaterial",
 		"name":"Gray_emiss",
 		"renderStates":[
 			{
@@ -17,27 +17,8 @@
 		"alphaTest":false,
 		"alphaTestValue":0.5,
 		"renderQueue":2000,
-		"albedoIntensity":4,
-		"enableLighting":true,
-		"shininess":1,
-		"textures":[
-			{
-				"name":"normalTexture",
-				"path":"Normal.jpg",
-				"constructParams":[
-					128,
-					128,
-					0,
-					true
-				],
-				"propertyParams":{
-					"filterMode":1,
-					"wrapModeU":0,
-					"wrapModeV":0,
-					"anisoLevel":1
-				}
-			}
-		],
+		"albedoIntensity":1.81,
+		"textures":[],
 		"vectors":[
 			{
 				"name":"tilingOffset",
@@ -49,19 +30,11 @@
 				]
 			},
 			{
-				"name":"specularColor",
-				"value":[
-					1,
-					1,
-					1
-				]
-			},
-			{
 				"name":"albedoColor",
 				"value":[
-					0.1037736,
-					0.07587221,
-					0.07587221,
+					0.0754717,
+					0.00747597,
+					0.00747597,
 					1
 				]
 			}

+ 6 - 16
release/wxgame/res/character/Conventional/Assets/Scenes/Materials/character_mat/Green_emiss.lmat

@@ -1,11 +1,11 @@
 {
 	"version":"LAYAMATERIAL:02",
 	"props":{
-		"type":"Laya.BlinnPhongMaterial",
+		"type":"Laya.UnlitMaterial",
 		"name":"Green_emiss",
 		"renderStates":[
 			{
-				"cull":0,
+				"cull":2,
 				"blend":0,
 				"srcBlend":1,
 				"dstBlend":0,
@@ -17,9 +17,7 @@
 		"alphaTest":false,
 		"alphaTestValue":0.5,
 		"renderQueue":2000,
-		"albedoIntensity":4,
-		"enableLighting":true,
-		"shininess":0.01,
+		"albedoIntensity":1,
 		"textures":[],
 		"vectors":[
 			{
@@ -32,19 +30,11 @@
 				]
 			},
 			{
-				"name":"specularColor",
-				"value":[
-					0,
-					0,
-					0
-				]
-			},
-			{
 				"name":"albedoColor",
 				"value":[
-					0.254902,
-					0.5019608,
-					0.2862745,
+					0,
+					1,
+					0.1821904,
 					1
 				]
 			}

+ 5 - 15
release/wxgame/res/character/Conventional/Assets/Scenes/Materials/character_mat/blue_emiss.lmat

@@ -1,7 +1,7 @@
 {
 	"version":"LAYAMATERIAL:02",
 	"props":{
-		"type":"Laya.BlinnPhongMaterial",
+		"type":"Laya.UnlitMaterial",
 		"name":"blue_emiss",
 		"renderStates":[
 			{
@@ -17,9 +17,7 @@
 		"alphaTest":false,
 		"alphaTestValue":0.5,
 		"renderQueue":2000,
-		"albedoIntensity":4,
-		"enableLighting":true,
-		"shininess":0.01,
+		"albedoIntensity":1.71,
 		"textures":[],
 		"vectors":[
 			{
@@ -32,19 +30,11 @@
 				]
 			},
 			{
-				"name":"specularColor",
-				"value":[
-					0,
-					0,
-					0
-				]
-			},
-			{
 				"name":"albedoColor",
 				"value":[
-					0.1321645,
-					0.2528907,
-					0.509434,
+					0,
+					0.4077673,
+					1,
 					1
 				]
 			}

+ 6 - 33
release/wxgame/res/character/Conventional/Assets/Scenes/Materials/character_mat/faint_purple.lmat

@@ -1,7 +1,7 @@
 {
 	"version":"LAYAMATERIAL:02",
 	"props":{
-		"type":"Laya.BlinnPhongMaterial",
+		"type":"Laya.UnlitMaterial",
 		"name":"faint_purple",
 		"renderStates":[
 			{
@@ -17,27 +17,8 @@
 		"alphaTest":false,
 		"alphaTestValue":0.5,
 		"renderQueue":2000,
-		"albedoIntensity":4,
-		"enableLighting":true,
-		"shininess":1,
-		"textures":[
-			{
-				"name":"normalTexture",
-				"path":"Normal.jpg",
-				"constructParams":[
-					128,
-					128,
-					0,
-					true
-				],
-				"propertyParams":{
-					"filterMode":1,
-					"wrapModeU":0,
-					"wrapModeV":0,
-					"anisoLevel":1
-				}
-			}
-		],
+		"albedoIntensity":1.33,
+		"textures":[],
 		"vectors":[
 			{
 				"name":"tilingOffset",
@@ -49,19 +30,11 @@
 				]
 			},
 			{
-				"name":"specularColor",
-				"value":[
-					0.5,
-					0.5,
-					0.5
-				]
-			},
-			{
 				"name":"albedoColor",
 				"value":[
-					0.1974457,
-					0.2101356,
-					0.2735849,
+					0.6901961,
+					0.6627451,
+					0.7333333,
 					1
 				]
 			}

+ 6 - 33
release/wxgame/res/character/Conventional/Assets/Scenes/Materials/character_mat/faint_red_emiss.lmat

@@ -1,7 +1,7 @@
 {
 	"version":"LAYAMATERIAL:02",
 	"props":{
-		"type":"Laya.BlinnPhongMaterial",
+		"type":"Laya.UnlitMaterial",
 		"name":"faint_red_emiss",
 		"renderStates":[
 			{
@@ -17,27 +17,8 @@
 		"alphaTest":false,
 		"alphaTestValue":0.5,
 		"renderQueue":2000,
-		"albedoIntensity":4,
-		"enableLighting":true,
-		"shininess":0.078125,
-		"textures":[
-			{
-				"name":"normalTexture",
-				"path":"Normal.jpg",
-				"constructParams":[
-					128,
-					128,
-					0,
-					true
-				],
-				"propertyParams":{
-					"filterMode":1,
-					"wrapModeU":0,
-					"wrapModeV":0,
-					"anisoLevel":1
-				}
-			}
-		],
+		"albedoIntensity":1.1,
+		"textures":[],
 		"vectors":[
 			{
 				"name":"tilingOffset",
@@ -49,19 +30,11 @@
 				]
 			},
 			{
-				"name":"specularColor",
-				"value":[
-					0.5,
-					0.5,
-					0.5
-				]
-			},
-			{
 				"name":"albedoColor",
 				"value":[
-					1,
-					0.844951,
-					0.6650944,
+					0.9811321,
+					0.7544912,
+					0.7080812,
 					1
 				]
 			}

+ 6 - 16
release/wxgame/res/character/Conventional/Assets/Scenes/Materials/character_mat/orange_emiss.lmat

@@ -1,11 +1,11 @@
 {
 	"version":"LAYAMATERIAL:02",
 	"props":{
-		"type":"Laya.BlinnPhongMaterial",
+		"type":"Laya.UnlitMaterial",
 		"name":"orange_emiss",
 		"renderStates":[
 			{
-				"cull":0,
+				"cull":2,
 				"blend":0,
 				"srcBlend":1,
 				"dstBlend":0,
@@ -17,9 +17,7 @@
 		"alphaTest":true,
 		"alphaTestValue":0,
 		"renderQueue":2450,
-		"albedoIntensity":4,
-		"enableLighting":true,
-		"shininess":0.01,
+		"albedoIntensity":1.3,
 		"textures":[],
 		"vectors":[
 			{
@@ -32,19 +30,11 @@
 				]
 			},
 			{
-				"name":"specularColor",
-				"value":[
-					0,
-					0,
-					0
-				]
-			},
-			{
 				"name":"albedoColor",
 				"value":[
-					0.6037736,
-					0.1437587,
-					0.01423994,
+					1,
+					0.7198543,
+					0,
 					1
 				]
 			}

+ 4 - 14
release/wxgame/res/character/Conventional/Assets/Scenes/Materials/character_mat/orange_red_emiss.lmat

@@ -1,7 +1,7 @@
 {
 	"version":"LAYAMATERIAL:02",
 	"props":{
-		"type":"Laya.BlinnPhongMaterial",
+		"type":"Laya.UnlitMaterial",
 		"name":"orange_red_emiss",
 		"renderStates":[
 			{
@@ -17,9 +17,7 @@
 		"alphaTest":false,
 		"alphaTestValue":0.5,
 		"renderQueue":2000,
-		"albedoIntensity":4,
-		"enableLighting":true,
-		"shininess":0.01,
+		"albedoIntensity":1.5,
 		"textures":[],
 		"vectors":[
 			{
@@ -32,18 +30,10 @@
 				]
 			},
 			{
-				"name":"specularColor",
-				"value":[
-					0,
-					0,
-					0
-				]
-			},
-			{
 				"name":"albedoColor",
 				"value":[
-					1,
-					0.08880375,
+					0.882353,
+					0.2666667,
 					0,
 					1
 				]

+ 4 - 14
release/wxgame/res/character/Conventional/Assets/Scenes/Materials/character_mat/purple_emiss.lmat

@@ -1,7 +1,7 @@
 {
 	"version":"LAYAMATERIAL:02",
 	"props":{
-		"type":"Laya.BlinnPhongMaterial",
+		"type":"Laya.UnlitMaterial",
 		"name":"purple_emiss",
 		"renderStates":[
 			{
@@ -17,9 +17,7 @@
 		"alphaTest":false,
 		"alphaTestValue":0.5,
 		"renderQueue":2000,
-		"albedoIntensity":4,
-		"enableLighting":true,
-		"shininess":0.01,
+		"albedoIntensity":1,
 		"textures":[],
 		"vectors":[
 			{
@@ -32,19 +30,11 @@
 				]
 			},
 			{
-				"name":"specularColor",
-				"value":[
-					0,
-					0,
-					0
-				]
-			},
-			{
 				"name":"albedoColor",
 				"value":[
-					0.4739905,
+					1,
 					0,
-					0.9056604,
+					0.9267902,
 					1
 				]
 			}

+ 6 - 33
release/wxgame/res/character/Conventional/Assets/Scenes/Materials/character_mat/red_emiss.lmat

@@ -1,7 +1,7 @@
 {
 	"version":"LAYAMATERIAL:02",
 	"props":{
-		"type":"Laya.BlinnPhongMaterial",
+		"type":"Laya.UnlitMaterial",
 		"name":"red_emiss",
 		"renderStates":[
 			{
@@ -17,27 +17,8 @@
 		"alphaTest":false,
 		"alphaTestValue":0.5,
 		"renderQueue":2000,
-		"albedoIntensity":4,
-		"enableLighting":true,
-		"shininess":1,
-		"textures":[
-			{
-				"name":"normalTexture",
-				"path":"Normal.jpg",
-				"constructParams":[
-					128,
-					128,
-					0,
-					true
-				],
-				"propertyParams":{
-					"filterMode":1,
-					"wrapModeU":0,
-					"wrapModeV":0,
-					"anisoLevel":1
-				}
-			}
-		],
+		"albedoIntensity":1.36,
+		"textures":[],
 		"vectors":[
 			{
 				"name":"tilingOffset",
@@ -49,19 +30,11 @@
 				]
 			},
 			{
-				"name":"specularColor",
-				"value":[
-					1,
-					1,
-					1
-				]
-			},
-			{
 				"name":"albedoColor",
 				"value":[
-					0.3773585,
-					0.05495728,
-					0.008899963,
+					1,
+					0,
+					0,
 					1
 				]
 			}

+ 3 - 30
release/wxgame/res/character/Conventional/Assets/Scenes/Materials/character_mat/white_emiss.lmat

@@ -1,7 +1,7 @@
 {
 	"version":"LAYAMATERIAL:02",
 	"props":{
-		"type":"Laya.BlinnPhongMaterial",
+		"type":"Laya.UnlitMaterial",
 		"name":"white_emiss",
 		"renderStates":[
 			{
@@ -17,27 +17,8 @@
 		"alphaTest":false,
 		"alphaTestValue":0.5,
 		"renderQueue":2000,
-		"albedoIntensity":2.35,
-		"enableLighting":true,
-		"shininess":1,
-		"textures":[
-			{
-				"name":"normalTexture",
-				"path":"Normal.jpg",
-				"constructParams":[
-					128,
-					128,
-					0,
-					true
-				],
-				"propertyParams":{
-					"filterMode":1,
-					"wrapModeU":0,
-					"wrapModeV":0,
-					"anisoLevel":1
-				}
-			}
-		],
+		"albedoIntensity":1,
+		"textures":[],
 		"vectors":[
 			{
 				"name":"tilingOffset",
@@ -49,14 +30,6 @@
 				]
 			},
 			{
-				"name":"specularColor",
-				"value":[
-					1,
-					1,
-					1
-				]
-			},
-			{
 				"name":"albedoColor",
 				"value":[
 					1,

+ 6 - 33
release/wxgame/res/character/Conventional/Assets/Scenes/Materials/character_mat/yellow_emiss.lmat

@@ -1,7 +1,7 @@
 {
 	"version":"LAYAMATERIAL:02",
 	"props":{
-		"type":"Laya.BlinnPhongMaterial",
+		"type":"Laya.UnlitMaterial",
 		"name":"yellow_emiss",
 		"renderStates":[
 			{
@@ -14,30 +14,11 @@
 			}
 		],
 		"enableVertexColor":false,
-		"alphaTest":false,
+		"alphaTest":true,
 		"alphaTestValue":0.5,
-		"renderQueue":2000,
-		"albedoIntensity":4,
-		"enableLighting":true,
-		"shininess":0.01,
-		"textures":[
-			{
-				"name":"normalTexture",
-				"path":"Normal.jpg",
-				"constructParams":[
-					128,
-					128,
-					0,
-					true
-				],
-				"propertyParams":{
-					"filterMode":1,
-					"wrapModeU":0,
-					"wrapModeV":0,
-					"anisoLevel":1
-				}
-			}
-		],
+		"renderQueue":2450,
+		"albedoIntensity":1.31,
+		"textures":[],
 		"vectors":[
 			{
 				"name":"tilingOffset",
@@ -49,18 +30,10 @@
 				]
 			},
 			{
-				"name":"specularColor",
-				"value":[
-					0,
-					0,
-					0
-				]
-			},
-			{
 				"name":"albedoColor",
 				"value":[
 					1,
-					0.8268979,
+					0.6679427,
 					0,
 					1
 				]

+ 5 - 5
release/wxgame/res/character/Conventional/Directional Light.lh

@@ -13,17 +13,17 @@
 				0
 			],
 			"rotation":[
-				0.3535534,
-				0.3535534,
-				0.1464466,
-				-0.8535535
+				-0.1665902,
+				0.2386972,
+				0.9557931,
+				-0.04160379
 			],
 			"scale":[
 				1,
 				1,
 				1
 			],
-			"intensity":0.5,
+			"intensity":0.8,
 			"lightmapBakedType":0,
 			"color":[
 				1,

BIN
release/wxgame/res/character/ui/main.bin


BIN
release/wxgame/res/character/ui/main_atlas0.png


BIN
release/wxgame/resources/ui/loading.bin


BIN
release/wxgame/resources/ui/loading_atlas0.png


+ 4 - 0
src/Agency/AgencyInGame.ts

@@ -15,6 +15,7 @@ import FriendInviteView from "../Push/FriendInviteView";
 import GiftView from "../View/GiftView";
 import ChoutiPanView from "../Push/ChoutiPanView";
 import { RecordManager } from "../WXSDK/RecordManager";
+import { MainPanel } from "../View/MainPanel";
 
 export  class AgencyInGame extends AgencyBaseControl 
 {
@@ -132,6 +133,9 @@ export  class AgencyInGame extends AgencyBaseControl
                 agencytrial.isshiyonging = false;
             }
         }
+        if(GameState.GameNum%3 == 0){
+            MainPanel.instance.skinclick();
+        }
         //打开好友邀请界面
         // ViewManager.Instance.add(FriendInviteView);
     }

+ 4 - 1
src/Agency/AgencySkin.ts

@@ -14,6 +14,7 @@ import {AgencyUserMessage} from "./AgencyUserMessage";
 export class AgencySkin extends AgencyBaseControl 
 {
     static key:string = "AgencySkin";
+    static instance:AgencySkin;
     
     localdata:any;
     pifuArr:Array<SkinData>;
@@ -22,6 +23,8 @@ export class AgencySkin extends AgencyBaseControl
     constructor() 
     { 
         super(); 
+        AgencySkin.instance = this;
+
     }
 
     protected initSelf():void
@@ -83,7 +86,7 @@ export class AgencySkin extends AgencyBaseControl
         }
     }
 
-    private AddLocalSkinData( id:any,state:number,hasnum:number ):void
+    public  AddLocalSkinData( id:any,state:number,hasnum:number ):void
     {
         this.localdata["pifu"][id] = {};
         this.localdata["pifu"][id]["state"] = state;

+ 3 - 0
src/Control/SceneControl.ts

@@ -44,6 +44,9 @@ export class SceneControl
     /*使用界面显示,0:砸蛋,1:宝箱*/
     static EggGGroup:number=0;
 
+    /**签到是否正在显示 */
+    static IsShowSign:boolean = false;
+
     public static get Instance():SceneControl
     {
         if( SceneControl.ins == null )

+ 4 - 0
src/Push/CpaDownsView.ts

@@ -5,6 +5,7 @@ import CpaItem from "./CpaItem";
 import {TimerService} from "../Time/TimerService";
 // import { ttad } from "../ttad";
 import { PlayerAccount } from "../WXSDK/PlayerAccount";
+import { SceneControl } from "../Control/SceneControl";
 
 export default class CpaDownsView extends PanelChildControl implements TimerControl
 {
@@ -44,6 +45,7 @@ export default class CpaDownsView extends PanelChildControl implements TimerCont
 
     private downclick():void
     {
+        if(SceneControl.IsShowSign)return;
         this._isdown = true;
         this._iscanmove = false;
         Laya.timer.clear( this,this.timeoutCallback );
@@ -53,11 +55,13 @@ export default class CpaDownsView extends PanelChildControl implements TimerCont
 
     private timeoutCallback():void
     {
+        if(SceneControl.IsShowSign)return;
         this._iscanmove = true;
     }
 
     private upclick():void
     {
+        if(SceneControl.IsShowSign)return;
         if( this._isdown )
         {
             this._isdown = false;

+ 65 - 0
src/View/CompletePanel.ts

@@ -27,12 +27,24 @@ export class CompletePanel extends PanelBaseControl
     txt_gold:fairygui.GTextField;
     btn_0:fairygui.GButton;
     btn_1:fairygui.GButton;
+    btn_2:fairygui.GButton;
     timenum:fairygui.GTextField;
     TianJiaAni:fairygui.Transition;
     BattleBtn:fairygui.GButton;
 
     tianjia:fairygui.GLoader;
 
+    //分享界面
+    ShareVideo:fairygui.GComponent;
+    ShareVideoBtn:fairygui.GButton;
+    jiesuanbtn:fairygui.GButton;
+    share_goldnum:fairygui.GTextField;
+
+    //框
+    kuang:fairygui.GButton;
+    //对号
+    duihao:fairygui.GImage;
+
 
     getgold:number = 0;
     private _gameProxy:AgencyInGame;
@@ -227,6 +239,7 @@ export class CompletePanel extends PanelBaseControl
             if(isLoad){
                 ( this.getProxy( AgencyUserMessage ) as AgencyUserMessage ).GoldUp( this.getgold*3 );
                 this._gameProxy.returnmainview(true);
+                this.BattleBtn.visible = false;
             }
         }))
         // ttad.ShowVideo((isLoad=>{
@@ -237,6 +250,31 @@ export class CompletePanel extends PanelBaseControl
         // }))
     }
 
+    //分享视频
+    private ShareVideoCallBack(){
+        RecordManager.Instance.ShareVideo((isLoad=>{
+            if(isLoad){
+                ( this.getProxy( AgencyUserMessage ) as AgencyUserMessage ).GoldUp( this.getgold*3 );
+                this.BattleBtn.visible = false;
+                this.ShareVideo.visible = false;
+            }
+        }))
+    }
+
+    //点击勾选框
+    ClickKuang(){
+        if(this.duihao.visible){
+            this.duihao.visible = false;
+            this.btn_1.visible = this.duihao.visible;
+            this.btn_2.visible = !this.duihao.visible;
+        }
+        else{
+            this.duihao.visible = true;
+            this.btn_1.visible = this.duihao.visible;
+            this.btn_2.visible = !this.duihao.visible;
+        }
+    }
+
     
 
     public destory():void
@@ -259,6 +297,15 @@ export class CompletePanel extends PanelBaseControl
         this._gameProxy = this.getProxy( AgencyInGame );
         this.c_state = this.getControllerByBame( "c_state" );
         this.txt_gold.text = this.getgold.toString();
+        
+        this.duihao = this.kuang.getChildAt(1) as fairygui.GImage;
+        this.duihao.visible = PlayerAccount.CurrentAccount.CurAccountData.Choose;
+        this.share_goldnum = this.ShareVideo.getChildAt(4) as fairygui.GTextField;
+        this.ShareVideoBtn = this.ShareVideo.getChildAt(1) as fairygui.GButton;
+        this.jiesuanbtn = this.ShareVideo.getChildAt(2) as fairygui.GButton;
+        this.share_goldnum.text = this.getgold.toString();
+        this.btn_1.visible = this.duihao.visible;
+        this.btn_2.visible = !this.duihao.visible;
 
         if(GameState.recordscree){
             this.BattleBtn.visible = false;
@@ -286,17 +333,35 @@ export class CompletePanel extends PanelBaseControl
                 this.c_state.selectedIndex = 1;
             }
         }
+        if(this.c_state.selectedIndex == 0){
+            this.ShareVideo.visible = true;
+            this.jiesuanbtn.visible = false;
+            Laya.timer.once(2000,this,()=>{
+                this.jiesuanbtn.visible = true;
+            })
+        }
+        else{
+            this.ShareVideo.visible = false;
+        }
         GuangGao.CheatBanner(this.btn_1);
     }
     playanimator(){
         this.TianJiaAni.play(null,1);
     }
 
+    ClickJieSuan(){
+        this.ShareVideo.visible = false;
+    }
+
     protected initEvent():void
     {
         this.AddEventByType( this.btn_0,Laya.Event.CLICK,this,this.btn0click );
         this.AddEventByType( this.btn_1,Laya.Event.CLICK,this,this.btn1click );
         this.AddEventByType( this.BattleBtn,Laya.Event.CLICK,this,this.ShareBattle);
+        this.AddEventByType( this.btn_2,Laya.Event.CLICK,this,this.btn1click);
+        this.AddEventByType( this.kuang,Laya.Event.CLICK,this,this.ClickKuang);
+        this.AddEventByType( this.ShareVideoBtn,Laya.Event.CLICK,this,this.ShareVideoCallBack);
+        this.AddEventByType( this.jiesuanbtn,Laya.Event.CLICK,this,this.ClickJieSuan);
     }
 
      time = 9;

+ 402 - 1
src/View/MainPanel.ts

@@ -15,10 +15,18 @@ import ChoutiPanView from "../Push/ChoutiPanView";
 import TuijianView from "../Push/TuijianView";
 import { FYHD_Sdk } from "../WXSDK/FYHD_Sdk";
 import { ttad } from "../WXSDK/ttad";
+import { WxApi } from "../WXSDK/Sdk";
+import { PlayerAccount } from "../WXSDK/PlayerAccount";
+import { AssetPath } from "../Config/AssetPath";
+import { LocalDataControl } from "../Control/LocalDataControl";
+import { UserDataInfo } from "../Data/UserDataInfo";
+import { SkinData } from "../Data/SkinData";
+import { SceneControl } from "../Control/SceneControl";
 
 export class MainPanel extends PanelBaseControl
 {
     static key:string = "MainPanel";
+    static instance:MainPanel;
 
     c_state:fairygui.Controller;
     load_clickpanel:fairygui.GLoader;
@@ -50,6 +58,7 @@ export class MainPanel extends PanelBaseControl
     constructor() 
     { 
         super("main","mainview"); 
+        MainPanel.instance = this;
     }
 
     private updateUserDataHandler():void
@@ -133,6 +142,7 @@ export class MainPanel extends PanelBaseControl
         GameStateControl.Instance.setClickPanel( this.load_clickpanel );
         this.returnmainHandler();
         this.updateUserDataHandler();
+        this.InitSignItem();
     }
     playanimator(){
         this.SkinAni.play(null,1);
@@ -154,7 +164,7 @@ export class MainPanel extends PanelBaseControl
         ViewManager.Instance.add( TuijianView );
     }
 
-    private skinclick():void
+    public skinclick():void
     {
         ttad.Clear();
         ( this.getProxy( AgencySkin ) as AgencySkin ).openview();
@@ -168,6 +178,7 @@ export class MainPanel extends PanelBaseControl
 
     private btnclick():void
     {
+        GameState.GameNum++;
         ttad.Clear();
         this.c_state.selectedIndex = 2;
         this.txt_lv.text = this.agencyusermessage.RoleData.getNowServerLevel().toString();
@@ -209,6 +220,396 @@ export class MainPanel extends PanelBaseControl
         this.addDataEvent( UserInfoEvent.UserInfoEvent_updateUserData,this,this.updateUserDataHandler );
     }
 
+     //#region 签到
+     btn_Sign:fairygui.GButton;
+
+     SignPanel:fairygui.GGroup;
+     SignItem1:fairygui.GImage;
+     SignItem2:fairygui.GImage;
+     SignItem3:fairygui.GImage;
+     SignItem4:fairygui.GImage;
+     SignItem5:fairygui.GImage;
+     SignItem6:fairygui.GImage;
+     SignItem7:fairygui.GImage;
+ 
+     SignAd:fairygui.GImage;
+ 
+     SignItem:fairygui.GImage[];
+     //#endregion
+
+    
+    //#region 初始化签到
+
+    private isShowSign:boolean=false;
+
+    /*勾选图*/
+    private SignTickImage:fairygui.GImage;
+    private signNoramButton:fairygui.GButton;
+    private signAdButton:fairygui.GButton;
+
+    private SignDanbeiBtn:fairygui.GButton;
+
+    private InitSignItem()
+    {
+        this.LoadSignData();
+        var _bo=true;
+        if(this.getSystemTime()==this.SignInfo["time"])
+        {
+            _bo=false;
+        }else
+        {
+            this.SignInfo["FisstLoad"]=0;
+        }
+        if(this.SignInfo["FisstLoad"]==1)
+        {
+            _bo=false;
+        }
+        // if(PlayerAccount.CurrentAccount.CurAccountData.SignDebug)
+        // {
+        //     _bo=true;
+        // }
+        SceneControl.IsShowSign=_bo;
+        this.SignPanel.visible=_bo;
+        if(!_bo)
+        {
+            return;
+        }
+
+        this.SignFun();
+    }
+
+    btn_SignFun()
+    {
+        if(this.getSystemTime()==this.SignInfo["time"])
+        {
+            this.isShowSign=true;
+        }
+
+        this.SignFun();
+
+        if(this.isShowSign)
+        {
+            WxApi.ShowTxt("已签到");//y.WxApi.ShowTxt("已签到")
+            this.SignSelectedMoney=0+"";
+        }
+    }
+
+    SignFun()
+    {
+        this.SignItem=new Array();
+        this.SignItem.push(this.SignItem1);
+        this.SignItem.push(this.SignItem2);
+        this.SignItem.push(this.SignItem3);
+        this.SignItem.push(this.SignItem4);
+        this.SignItem.push(this.SignItem5);
+        this.SignItem.push(this.SignItem6);
+        this.SignItem.push(this.SignItem7);
+
+        this.SignTickImage=this.SignAd.asCom.getChildAt(2) as fairygui.GImage;
+        var signTickButton=this.SignAd.asCom.getChildAt(1) as fairygui.GButton;
+        this.signAdButton=this.SignAd.asCom.getChildAt(3) as fairygui.GButton;
+        this.signNoramButton=this.SignAd.asCom.getChildAt(4) as fairygui.GButton;
+        this.SignDanbeiBtn = this.SignAd.asCom.getChildAt(5) as fairygui.GButton;
+
+        this.SignTickImage.visible=(PlayerAccount.CurrentAccount.CurAccountData.ShowSign);
+        this.signNoramButton.visible = this.SignTickImage.visible;
+        this.SignDanbeiBtn.visible = !this.signNoramButton.visible;
+
+        this.AddEventByType( signTickButton,Laya.Event.CLICK,this,this.SignTickButtonFun );
+        this.AddEventByType( this.signAdButton,Laya.Event.CLICK,this,this.SignAdButtonFun );
+        this.AddEventByType( this.signNoramButton,Laya.Event.CLICK,this,this.SignAdButtonFun );
+        this.AddEventByType(this.SignDanbeiBtn,Laya.Event.CLICK,this,this.SignNormalButtonFun);
+        
+        var num=this.SignInfo["day"];
+        var numIndex=100;
+        if(num<7)
+        {
+            numIndex=100;
+        }else
+        {
+            numIndex=107;
+            num=num%7;
+        }
+        
+        this.SignPiFu=null;
+        this.SignSelectedMoney=0+"";
+        for (let index = 0; index < this.SignItem.length; index++) {
+
+            var data= PlayerAccount.CurrentAccount.CurAccountData.GetRewardConfig((numIndex+1+index));
+
+            var pifu=null;
+            if(data["reward_item"]!=1000)
+            {
+                if(Number(data["reward_item"])>6000)
+                {
+                    var pifuIndedx=Number(data["reward_item"])%6000;
+                    pifu=PlayerAccount.CurrentAccount.CurAccountData.GetSkinAttr(pifuIndedx);
+                    console.log(pifu );
+                }
+            }
+           
+            var isOk=true;
+            var isCnaSign=true;
+            if(index<num)
+            {
+                isOk=true;
+                isCnaSign=false;
+            }else if(index==num)
+            {
+                isOk=false;
+                isCnaSign=true;
+       
+            }else
+            {
+                isOk=false;
+                isCnaSign=false;
+            }
+            var text;
+            if(index<6){
+                text="第 "+(index+1)+" 天";
+            }
+            else{
+                text="豪华皮肤";
+            }
+            this.SetSignItemInfo(this.SignItem[index],text,data,isOk,isCnaSign,pifu);
+        }
+
+        ttad.Showbanner();//
+        
+    }
+
+    /**签到*/
+    private SetSignItemInfo(_signItem:fairygui.GImage,text:string,data:any,_isOk:boolean,_isCanSign:boolean,pifu:any)
+    {
+        console.log(data);
+        if(pifu==null)
+        {
+            console.log(111111111111);
+            var mytext=_signItem.asCom.getChildAt(2) as fairygui.GTextField;
+            mytext.text=text;
+            var mymoney=_signItem.asCom.getChildAt(3) as fairygui.GTextField;
+            mymoney.text=data["reward_num"];
+    
+            _signItem.asCom.getChildAt(5).visible=false;
+            
+            if(_isOk)
+            {
+                _signItem.asCom.getChildAt(1).visible=false;
+                _signItem.asCom.getChildAt(6).visible=true;
+                _signItem.asCom.getChildAt(7).visible=true;
+            }else if(_isCanSign)
+            {
+                _signItem.asCom.getChildAt(1).visible=true;
+                _signItem.asCom.getChildAt(7).visible=false;
+                _signItem.asCom.getChildAt(6).visible=false;
+                this.SignSelectedItem=_signItem;
+                this.SignSelectedText=text;
+                this.SignSelectedMoney=data["reward_num"];
+                // var child1=_signItem.asCom.getChildAt(7) as fairygui.GButton;
+                // child1.visible=true;
+                // this.addListener(child1,Laya.Event.CLICK,this.SignButtonFun,null);
+                // this.addListener( child1,Laya.Event.CLICK,this,this.SignButtonFun );
+            }else
+            {
+                _signItem.asCom.getChildAt(1).visible=false;
+                _signItem.asCom.getChildAt(6).visible=false;
+                _signItem.asCom.getChildAt(7).visible=false;
+            }
+        }
+        else
+        {
+            console.log(2222222222);
+            var mytext=_signItem.asCom.getChildAt(2) as fairygui.GTextField;
+            var mymoney=_signItem.asCom.getChildAt(3) as fairygui.GTextField;
+            mymoney.visible=false;
+            var myimage=_signItem.asCom.getChildAt(4) as fairygui.GTextField;
+            myimage.visible=false;
+    
+            var GLoader=_signItem.asCom.getChildAt(5) as fairygui.GLoader;
+            
+            if(_isOk)
+            {
+                GLoader.icon = AssetPath.getroleicon( pifu.icon );
+                _signItem.asCom.getChildAt(1).visible=false;
+                _signItem.asCom.getChildAt(6).visible=true;
+                _signItem.asCom.getChildAt(7).visible=true;
+               
+            }else if(_isCanSign)
+            {
+                _signItem.asCom.getChildAt(1).visible=true;
+                _signItem.asCom.getChildAt(7).visible=false;
+                _signItem.asCom.getChildAt(6).visible=false;
+                this.SignSelectedItem=_signItem;
+                this.SignSelectedText=text;
+                this.SignSelectedMoney=0+"";
+                this.SignPiFu=pifu;
+                GLoader.visible=true;
+                GLoader.icon = AssetPath.getroleicon( this.SignPiFu.icon );
+                // this.addListener(child1,Laya.Event.CLICK,this.SignButtonFun,null);
+                // this.addListener( child1,Laya.Event.CLICK,this,this.SignButtonFun );
+            }else
+            {
+                GLoader.icon = AssetPath.getroleicon( pifu.icon );
+                _signItem.asCom.getChildAt(1).visible=false;
+                _signItem.asCom.getChildAt(6).visible=false;
+                _signItem.asCom.getChildAt(7).visible=false;
+            }
+        }
+
+    }
+
+    private SignSelectedItem:fairygui.GImage;
+    private SignSelectedText:string;
+    private SignSelectedMoney:string;
+
+    private SignPiFu:any;
+
+    public SignButtonFun()
+    {
+
+        console.log("收取了");
+        if(this.getSystemTime==this.SignInfo["time"])
+        {
+            return;
+        }
+        this.SignAd.visible=true;
+        Laya.timer.once(3000,this,()=>{this.signNoramButton.visible=true});
+
+        this.SetSignItemInfo(this.SignSelectedItem,this.SignSelectedText,this.SignSelectedMoney,true,false,this.SignPiFu);
+        this.SaveSignData();
+    }
+
+
+    /*勾选方法*/
+    private SignTickButtonFun()
+    {
+        this.SignTickImage.visible=!this.SignTickImage.visible;
+        this.SignDanbeiBtn.visible = !this.SignTickImage.visible;
+        this.signNoramButton.visible = this.SignTickImage.visible;
+    }
+
+    /*点击视频双倍领取*/
+    private SignAdButtonFun()
+    {
+        this.WinAdButtonFun();
+    }
+
+    /*普通领取*/
+    private SignNormalButtonFun()
+    {
+        this.SaveSignData();
+        if(this.SignTickImage.visible==true)
+        {
+            this.WinAdButtonFun();
+        }else
+        {
+            (this.getProxy( AgencyUserMessage ) as AgencyUserMessage ).GoldUp( Number(this.SignSelectedMoney) * 1 );
+            if(this.SignPiFu!=null)
+            {
+                this.SignAddPifu();
+            }
+      
+            this.updateUserDataHandler();
+        }
+
+        SceneControl.IsShowSign=false;
+        this.SignPanel.visible = false;
+        ttad.Clear();//;y.WxApi.ShowTxt("签到成功")
+    }
+
+            /**胜利界面广告按钮*/
+        private WinAdButtonFun()
+        {
+            WxApi.recordAldEvent("签到...");
+            if(!Laya.Browser.onMobile)
+            {
+                return;
+            }
+            ttad.ShowVideo((flag)=>
+                {
+                    console.log("播放视频返回成功"+flag);
+                    if(flag)
+                    {
+                        console.log("播放视频返回");
+                        ( this.getProxy( AgencyUserMessage ) as AgencyUserMessage ).GoldUp( Number(this.SignSelectedMoney) * 2 );
+                        if(this.SignPiFu!=null)
+                        {
+                            this.SignAddPifu();
+                        }
+                        this.SaveSignData();//this.SaveSignData()
+                        this.SignPanel.visible = false;
+                        SceneControl.IsShowSign=false;
+                        this.updateUserDataHandler();
+                    }
+                })
+        }
+
+
+        private PaoKuSign:string="PaoKuSignInfo";
+        SignInfo:any=null;
+        private LoadSignData()
+        {
+            // this.SignInfo={"day":0,"time":0,"FisstLoad":0};
+            //     Laya.LocalStorage.setJSON("PaoKuSign",this.SignInfo);
+            this.SignInfo=Laya.LocalStorage.getJSON(this.PaoKuSign);
+            if(this.SignInfo==0||this.SignInfo==null)
+            {
+                var time=this.getSystemTime();
+                this.SignInfo={"day":0,"time":0,"FisstLoad":0};
+                Laya.LocalStorage.setJSON(this.PaoKuSign,this.SignInfo);
+            }
+            console.log("asdasd");
+        }
+
+        private SaveSignData()
+        {
+            this.SignInfo["FisstLoad"]=1;
+            this.SignInfo["day"]++;
+
+            this.SignInfo["time"]=this.getSystemTime();
+            
+            Laya.LocalStorage.setJSON(this.PaoKuSign,this.SignInfo);
+        }
+
+        private getSystemTime(): number {
+            var curDate: Date = new Date();
+            var month: number = curDate.getMonth() + 1;
+            console.log("月:" + month.toString());
+    
+            var date: number = curDate.getDate();
+            console.log("日:" + date.toString());
+    
+            return Number( (month + "" + date));
+        }
+
+
+
+        private SignAddPifu()
+        {
+            var cachedata = LocalDataControl.Instance.GetLocalCaCheData( UserDataInfo.skin );
+            // var cachedata = CacheManager.getInstance().getCacheObj( UserCacheType.skin );
+            var id=this.SignPiFu["id"];
+            var _skinProxy:AgencySkin = this.getProxy( AgencySkin );
+
+            var piFuVO:SkinData=null
+            for (let index = 0; index < _skinProxy.pifuArr.length; index++) {
+                
+                piFuVO=_skinProxy.pifuArr[index];
+                if(piFuVO.roleCFG.id==id)
+                {
+                    break;
+                }
+            }
+            piFuVO.state = 1;
+            AgencySkin.instance.AddLocalSkinData(piFuVO.roleCFG.id,piFuVO.state,piFuVO.hasnum);
+            DispatcherManager.dispatchEvent( GameState.updateSKinView);
+            console.log("获取皮肤");
+            console.log(cachedata);
+        }
+
+
+    //#endregion
+
     
 
 }

+ 18 - 4
src/WXSDK/PlayerAccount.ts

@@ -74,25 +74,39 @@ export class AccountData {
 
     //获取玩家落入空中死亡距离
     public get DieDistance():number{
-        return Number(this.m_app_setting["diedistance"]);
+        return Number(this.m_app_setting["DieDistance"]);
     }
     //获取开局砸蛋几率
     public get HitEgg():number{
-        return Number(this.m_app_setting["hitegg"]);
+        return Number(this.m_app_setting["HitEgg"]);
     }
     //获取结算后砸蛋出现几率
     public get EndCheat():number{
-        return Number(this.m_app_setting["endcheat"]);
+        return Number(this.m_app_setting["EndCheat"]);
     }
     //获取误触奖励金币数
     public get CheatReward():number{
-        return Number(this.m_app_setting["cheatreward"]);
+        return Number(this.m_app_setting["CheatReward"]);
     }
     //白名单用户
     public get WhiteUser():boolean{
         return this.m_app_setting["WhiteUser"] == "1";
     }
 
+    //签到功能是否开启
+    public get StrategySwitch():boolean{
+        return this.m_app_setting["StrategySwitch"] == "1";
+    }
+
+    //签到功能是否开启
+    public get ShowSign():boolean{
+        return this.m_app_setting["ShowSign"] == "1";
+    }
+    //自动勾选
+    public get Choose():boolean{
+        return this.m_app_setting["choose"] == "1";
+    }
+
     public get lotterytime():number
     {
         return Number(this.lottery["day_video_times"]);

+ 6 - 0
src/utils/GameState.ts

@@ -108,4 +108,10 @@ export  class GameState
 
     /**是否已经发布过录屏 */
     static recordscree:boolean = false;
+
+    /**游戏次数*/
+    static GameNum:number = 0;
+
+
+
 }