21.25

color3D_laya/bin/index.js

@@ -10,6 +10,7 @@ window.screenOrientation = "portrait";
 //-----libs-begin-----
 loadLib("libs/laya.core.js")
 loadLib("libs/laya.html.js")
+loadLib("libs/laya.ui.js")
 loadLib("libs/laya.d3.js")
 loadLib("libs/oimo.js")
 //-----libs-end-------

color3D_laya/bin/res/LayaScene_main/Conventional/Resources/unity_builtin_extra.lmat

@@ -0,0 +1,58 @@
+{
+	"version":"LAYAMATERIAL:02",
+	"props":{
+		"type":"Laya.BlinnPhongMaterial",
+		"name":"Default-Material",
+		"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":[
+					1,
+					1,
+					1,
+					1
+				]
+			},
+			{
+				"name":"emissionColor",
+				"value":[
+					0,
+					0,
+					0,
+					0.9999999
+				]
+			}
+		],
+		"defines":[]
+	}
+}

color3D_laya/laya/.laya

@@ -1,6 +1,6 @@
 <project version="2.0">
-   <asynRes>img,temp,sound                                    </asynRes>
-   <unDealRes>embed                                    </unDealRes>
+   <asynRes>img,temp,sound                                       </asynRes>
+   <unDealRes>embed                                       </unDealRes>
    <resTypes>png,jpg   </resTypes>
    <resExportPath>bin/res/atlas   </resExportPath>
    <asynResExportPath>bin   </asynResExportPath>
@@ -15,7 +15,7 @@ var Dialog=laya.ui.Dialog;]]>   </codeImportsJS>
    <shareResPath/>
    <codeType>1   </codeType>
    <resCanCompress/>
-   <resPublishQuality>80                                    </resPublishQuality>
+   <resPublishQuality>80                                       </resPublishQuality>
    <langPath/>
    <defaultFont/>
    <codeImportsTS><![CDATA[import View=Laya.View;

color3D_laya/laya/pages/game_ui.scene

@@ -2,19 +2,32 @@
     "x":0,
     "type":"Scene",
     "selectedBox":2,
-    "selecteID":3,
+    "selecteID":4,
     "searchKey":"Scene",
     "props":{"width":720,"sceneColor":"#000000","height":1280},
     "nodeParent":-1,
-    "maxID":4,
+    "maxID":5,
     "label":"Scene",
     "isOpen":true,
-    "isDirectory":false,
+    "isDirectory":true,
     "isAniNode":true,
-    "hasChild":false,
+    "hasChild":true,
     "compId":2,
     "child":[
-        ],
+        {
+            "x":15,
+            "type":"Button",
+            "searchKey":"Button,startBtn",
+            "props":{"y":615,"x":225,"width":269,"var":"startBtn","labelSize":50,"label":"开始游戏","height":50},
+            "nodeParent":2,
+            "label":"startBtn",
+            "isDirectory":false,
+            "isAniNode":true,
+            "hasChild":false,
+            "compId":4,
+            "child":[
+                ]
+        }],
     "animations":[
         {
             "nodes":[

color3D_laya/src/script/Behaviour/PassivityBehaviour.ts

@@ -17,6 +17,9 @@ export default class PassivityBehaviour extends OimoRigidBody {
     public init(data?: OimoBodyData) {
         if (!data) data = new OimoBodyData();
         data.move = true;
+      //  data.density=0;
+        //data.friction=0;
+        //data.restitution=2;
         super.init(data);
     }
     // public setData(vec: Laya.Vector3) {
@@ -38,7 +41,7 @@ export default class PassivityBehaviour extends OimoRigidBody {
     public onUpdate() {
         super.onUpdate();
 
-      //  super.checkContact(1111);
+        super.checkContact(1111);
     }
 
     public onDisable() {

color3D_laya/src/script/GameLogic/CameraBehavior.ts

@@ -5,6 +5,8 @@ import Transform3D = Laya.Transform3D;
 import Game_Tool from "../Util/Game_Tool";
 import { Main } from "../../Main";
 import { GameController } from "./GameController";
+import GameDefined from "./GameDefined";
+import { PlayerController } from "./PlayerController";
 export default class CameraBehavior extends Laya.Script3D {
 
     //public target: Sprite3D;
@@ -25,11 +27,17 @@ export default class CameraBehavior extends Laya.Script3D {
         this._tran = this.selfObj.transform;
         let origSize = this.selfObj.fieldOfView;
 
-        let origratio = 0.5;//    原始屏幕的宽高比
+        let origratio = 0.5;//    原始屏幕的宽高比 720/1280
         let nowratio = Main.nowratio;
 
         let nowSize = Main.nowratio * origSize / origratio;
         this.selfObj.fieldOfView = nowSize;
+
+        this.speed=GameDefined.moveSpeed;
+
+        // GameDefined.minDis= Main.nowratio * GameDefined.minDis * origratio;
+        // console.log(GameDefined.minDis);
+     var dis=   Vector3.distance( PlayerController.Instance.player.transform.position,this._tran.position)
     }
 
     onUpdate() {

color3D_laya/src/script/GameLogic/GameDefined.ts

@@ -7,9 +7,13 @@ export default class GameDefined {
 
     public static playerbodyname = 1111;
 
-    public static maxDis = 13.54;//玩家和相机的最大距离
+    public static maxDis = 26.53;//玩家和相机的最大距离
 
-    public static moveSpeed=0.06;
+    public static minDis = 13;
+
+    public static x_player = 5;// 玩家可以在左右的距离
+
+    public static moveSpeed = 0.04;
 }
 
 export enum BodyType {
@@ -18,3 +22,10 @@ export enum BodyType {
     box = 10,
     plane = 11
 }
+export enum ColorType {
+    white = 1,
+    red = 2,
+    yellow = 3,
+    purple = 4,
+    black = 5
+}

color3D_laya/src/script/GameLogic/PlayerController.ts

@@ -1,6 +1,10 @@
 
 import Sprite3D = Laya.Sprite3D;
 import PlayerBehaviour from "../Behaviour/PlayerBehaviour";
+import { Player } from "./player";
+import { SceneController } from "./SceneController";
+import Vector3 = Laya.Vector3;
+import GameDefined from "./GameDefined";
 export class PlayerController {
     private static instance: PlayerController;
     public static get Instance(): PlayerController {
@@ -8,12 +12,34 @@ export class PlayerController {
     }
 
     public player: Sprite3D;
+    public playerBehave: Player;
     public Init(_p: Sprite3D) {
         if (_p) {
             this.player = _p;
             var _pb = this.player.getChildAt(0).getComponent(PlayerBehaviour);
             if (!_pb) _pb = this.player.addComponent(PlayerBehaviour);
             _pb.init();
+            this.playerBehave = this.player.getComponent(Player);
+            if (!this.playerBehave) this.playerBehave = this.player.addComponent(Player);
         }
     }
+
+    public StartSliderPlayer(_y: number, _x: number) {
+
+        this.playerBehave.SetSpeed(_y * 0.01, _x * 0.01);
+        this.JundgePByCDis();
+    }
+
+    private tempPos = new Vector3(0, 0.5, 0);
+    public JundgePByCDis() {
+        var camera = SceneController.Instance._camera;
+        this.tempPos.z=this.player.transform.position.z;
+        var dis = Vector3.distance(this.tempPos, camera.transform.position);
+        if(dis<=GameDefined.minDis||dis>=GameDefined.maxDis){
+            this.StopSliderPlayer();
+        }
+    }
+    public StopSliderPlayer() {
+        this.playerBehave.SetSpeed();
+    }
 }

color3D_laya/src/script/GameLogic/SceneController.ts

@@ -12,8 +12,8 @@ export class SceneController {
 
 
     private floor: Sprite3D;
-    private _camera: Laya.Camera;
-    public 
+    public _camera: Laya.Camera;
+     
     public Init(_s: Scene3D) {
         if (_s) {
             Laya.stage.addChild(_s);

color3D_laya/src/script/GameLogic/player.ts

@@ -0,0 +1,45 @@
+import Sprite3D = Laya.Sprite3D;
+import Transform3D = Laya.Transform3D;
+import GameDefined from "./GameDefined";
+import { GameController } from "./GameController";
+import Vector3 = Laya.Vector3;
+export class Player extends Laya.Script3D {
+
+    constructor() {
+        super();
+    }
+
+    private self: Sprite3D;
+    private _tran: Transform3D;
+    public _speed = Vector3._ZERO.clone();
+    onAwake() {
+        this.self = this.owner as Sprite3D;
+        this._tran = this.self.transform;
+        this.SetSpeed();
+    }
+
+
+    onUpdate() {
+        if (GameController.Instance.gamestart) {
+            this._tran.localPositionZ += this._speed.y;
+            this._tran.localPositionX += this._speed.x;
+            if (this._tran.localPositionX >= 5) this._tran.localPositionX = 5;
+            if (this._tran.localPositionX <= -5) this._tran.localPositionX = -5;
+        }
+    }
+    SetSpeed(_Y?, _X?) {
+        if (!_Y) {
+            this._speed.y = GameDefined.moveSpeed;
+        }
+        else {
+            this._speed.y = GameDefined.moveSpeed + _Y;
+        };
+
+        if (!_X) {
+            this._speed.x = 0;
+        } else {
+            this._speed.x = _X;
+        }
+    }
+
+}

color3D_laya/src/script/Gameui/game_ui.ts

@@ -3,6 +3,7 @@ import { EventManager } from "../GameLogic/EventManager";
 import Transform3D = Laya.Transform3D;
 import { PlayerController } from "../GameLogic/PlayerController";
 import Vector3 = Laya.Vector3;
+import { GameController } from "../GameLogic/GameController";
 
 
 export class game_ui extends ui.game_uiUI implements UI_Interface {
@@ -27,6 +28,10 @@ export class game_ui extends ui.game_uiUI implements UI_Interface {
         this.on(Laya.Event.MOUSE_DOWN, this, this.OnClickDown);
         this.on(Laya.Event.MOUSE_UP, this, this.OnClickUp);
         this.on(Laya.Event.MOUSE_OUT, this, this.OnClickUp);
+        this.startBtn.clickHandler = new Laya.Handler(this, () => {
+            GameController.Instance.gamestart = true;
+            this.startBtn.visible = false;
+        });
     }
     offEvent() {
         EventManager.off(Laya.Event.RESIZE, this, this.resizeHander);
@@ -41,37 +46,48 @@ export class game_ui extends ui.game_uiUI implements UI_Interface {
     }
 
 
-    private _mousePos: Vector3=Vector3._ZERO.clone();
+    private _mousePos: Vector3 = Vector3._ZERO.clone();
     private tempMouse = Vector3._ZERO.clone();
     private tar = Vector3._ZERO.clone();
     private lerpPos = Vector3._ZERO.clone();
+    private clickD = false;
     OnClickDown(e: Laya.Event) {
+        if (!GameController.Instance.gamestart) return;
+        this.clickD = true;;
+
         this.on(Laya.Event.MOUSE_MOVE, this, this.OnSlider);
         this._mousePos.x = Laya.MouseManager.instance.mouseX;
         this._mousePos.z = Laya.MouseManager.instance.mouseY;
     }
     OnClickUp(e: Laya.Event) {
+        if (!this.clickD) return;
+        if (!GameController.Instance.gamestart) return;
+
+        this.clickD = false;
         this.off(Laya.Event.MOUSE_MOVE, this, this.OnSlider);
+        PlayerController.Instance.StopSliderPlayer();
     }
 
     OnSlider(e: Laya.Event) {
         this.tempMouse.x = Laya.MouseManager.instance.mouseX;
         this.tempMouse.z = Laya.MouseManager.instance.mouseY;
         var offestX = this.tempMouse.x - this._mousePos.x;
-        var offestY = this.tempMouse.z - this._mousePos.z;
-        if (offestX > 0) offestX = offestX < 0.2 ? offestX : 0.2;
-        if (offestX < 0) offestX = offestX > -0.2 ? offestX : -0.2;
-        if (offestY > 0) offestY = offestY < 0.2 ? offestY : 0.2;
-        if (offestY < 0) offestY = offestY > -0.2 ? offestY : -0.2;
+        var offestZ = this.tempMouse.z - this._mousePos.z;
+        if (offestX >= 0) offestX = offestX < 10 ? offestX : 10;
+        if (offestX < 0) offestX = offestX > -10 ? offestX : -10;
+        if (offestZ >= 0) offestZ = offestZ < 10 ? offestZ : 10;
+        if (offestZ < 0) offestZ = offestZ > -10 ? offestZ : -10;
+        // if (this.pTrans) {
+        //     this.tar.x = this.pTrans.localPositionX -= offestX;
+        //     this.tar.y = this.pTrans.localPositionY;
+        //     this.tar.z = this.pTrans.localPositionZ -= offestY;
+        // }
+        // Vector3.lerp(this.pTrans.localPosition, this.tar, 0.1, this.lerpPos);
+        // this.pTrans.localPositionX = this.lerpPos.x;
+        // this.pTrans.localPositionZ = this.lerpPos.z;
+
+        PlayerController.Instance.StartSliderPlayer(-offestZ, -offestX);
 
-        if (this.pTrans) {
-            this.tar.x = this.pTrans.localPositionX -= offestX;
-            this.tar.y = this.pTrans.localPositionY;
-            this.tar.z = this.pTrans.localPositionZ -= offestY;
-        }
-        Vector3.lerp(this.pTrans.localPosition, this.tar, 0.1, this.lerpPos);
-        this.pTrans.localPositionX = this.lerpPos.x;
-        this.pTrans.localPositionZ = this.lerpPos.z;
         this._mousePos.x = Laya.MouseManager.instance.mouseX;
         this._mousePos.z = Laya.MouseManager.instance.mouseY;
     }

color3D_laya/src/script/Oimo/OimoHelper.ts

@@ -20,7 +20,7 @@ export default class OimoHelper {
             worldscale: 1, // scale full world 
             random: true,  // randomize sample
             info: false,   // calculate statistic or not
-            gravity: [0, -9.8, 0]
+            gravity: [0, -100, 0]
         });
         this.world.play();
     }

color3D_laya/src/ui/layaMaxUI.ts

@@ -5,7 +5,8 @@ import Scene=Laya.Scene;
 var REG: Function = Laya.ClassUtils.regClass;
 export module ui {
     export class game_uiUI extends Scene {
-        public static  uiView:any ={"type":"Scene","props":{"width":720,"height":1280},"compId":2,"loadList":[],"loadList3D":[]};
+		public startBtn:Laya.Button;
+        public static  uiView:any ={"type":"Scene","props":{"width":720,"height":1280},"compId":2,"child":[{"type":"Button","props":{"y":615,"x":225,"width":269,"var":"startBtn","labelSize":50,"label":"开始游戏","height":50},"compId":4}],"loadList":[],"loadList3D":[]};
         constructor(){ super()}
         createChildren():void {
             super.createChildren();

color3D_unity/color3D/Assets/Editor/Editor_Tool.cs

@@ -20,7 +20,7 @@ public class Editor_Tool : EditorWindow
             return;
         }
         var path = "Assets/Prefabs/M/whitemat.mat";
-        ForeachObjCorss(objs, path);
+        ForeachObjCorss(objs, path,1);
     }
     [MenuItem("modification/修改紫色材质")]
     public static void Changeperple()
@@ -36,7 +36,7 @@ public class Editor_Tool : EditorWindow
             return;
         }
         var path = "Assets/Prefabs/M/perple.mat";
-        ForeachObjCorss(objs, path);
+        ForeachObjCorss(objs, path,4);
     }
 
     [MenuItem("modification/修改红色材质")]
@@ -53,7 +53,7 @@ public class Editor_Tool : EditorWindow
             return;
         }
         var path = "Assets/Prefabs/M/redmat.mat";
-        ForeachObjCorss(objs, path);
+        ForeachObjCorss(objs, path,2);
     }
     [MenuItem("modification/修改黑色材质")]
     public static void ChangeBlack()
@@ -69,7 +69,7 @@ public class Editor_Tool : EditorWindow
             return;
         }
         var path = "Assets/Prefabs/M/blackmat.mat";
-        ForeachObjCorss(objs, path);
+        ForeachObjCorss(objs, path,5);
     }
 
     [MenuItem("modification/修改黄色材质")]
@@ -86,14 +86,16 @@ public class Editor_Tool : EditorWindow
             return;
         }
         var path = "Assets/Prefabs/M/yellowmat.mat";
-        ForeachObjCorss(objs, path);
+        ForeachObjCorss(objs, path,3);
     }
-    static void ForeachObjCorss(Transform[] obj, string path)
+    static void ForeachObjCorss(Transform[] obj, string path,int type)
     {
         for (int i = 0; i < obj.Length; i++)
         {
             foreach (Renderer it in obj[i].GetComponentsInChildren<Renderer>())
             {
+
+                it.transform.parent.name = "obs__" + type;
                 Material mat = AssetDatabase.LoadAssetAtPath<Material>(path);
                 Material[] bufMat = new Material[it.sharedMaterials.Length];
                 for (int j = 0; j < it.sharedMaterials.Length; j++)
@@ -105,4 +107,35 @@ public class Editor_Tool : EditorWindow
         }
       
     }
+
+    [MenuItem("modification/删除碰撞器")]
+    public static void DeleCollider()
+    {
+
+        //获取编辑器中当前选中的物体
+        Transform[] objs = Selection.transforms;
+        //如果没有选择任何物体，弹出提示并退出
+        Debug.Log(objs.Length);
+        if (objs.Length == 0)
+        {
+            Debug.Log("没有选中物体");
+            return;
+        }
+      
+        ForeachObjCollider(objs);
+    }
+    static void ForeachObjCollider(Transform[] obj)
+    {
+        for (int i = 0; i < obj.Length; i++)
+        {
+            foreach (Collider it in obj[i].GetComponentsInChildren<Collider>())
+            {
+                if (it != null)
+                {
+                    DestroyImmediate(it);
+                }
+            }
+        }
+
+    }
 }

color3D_unity/color3D/Assets/LayaAir3D/LayaShader/LayaShader/LayaShuriKenParticle.shader

@@ -1,4 +1,4 @@
-Shader "LayaAir3D/Particle/ShurikenParticle" {
+Shader "LayaAir3D/ShurikenParticle" {
 	Properties {
 		_MainTex("Particle Texture", 2D) = "white" {}
 		_TintColor("Tint Color", Color) = (0.5,0.5,0.5,0.5)

color3D_unity/color3D/Assets/LayaAir3D/LayaTool/Configuration.xml

@@ -156,5 +156,5 @@
     <ScrollPositionY>0</ScrollPositionY>
   </config5>
   <language>1</language>
-  <time>1564968561</time>
+  <time>1565057408</time>
 </LayaExportSetting>

color3D_unity/color3D/Assets/Prefabs/obs7.prefab.meta

@@ -1,6 +1,6 @@
 fileFormatVersion: 2
-guid: ed4975c1e801ad44e96490a97674a180
-timeCreated: 1564737887
+guid: 7c2367bf0ee6ded4c94c786502e744a9
+timeCreated: 1565082356
 licenseType: Pro
 NativeFormatImporter:
   mainObjectFileID: 100100000

color3D_unity/color3D/Assets/Prefabs/obs4.prefab.meta

@@ -1,6 +1,6 @@
 fileFormatVersion: 2
 guid: d0be3190897ca3644ae8c1ac37a6ed32
-timeCreated: 1564714598
+timeCreated: 1565080220
 licenseType: Pro
 NativeFormatImporter:
   mainObjectFileID: 100100000

color3D_unity/color3D/Assets/Prefabs/obs2.prefab.meta

@@ -1,6 +1,6 @@
 fileFormatVersion: 2
-guid: 88b4e5a3cc510264fbb08bbf290af154
-timeCreated: 1564714525
+guid: 11a5b97fb242b01448f7278ed9e951be
+timeCreated: 1565079522
 licenseType: Pro
 NativeFormatImporter:
   mainObjectFileID: 100100000

color3D_unity/color3D/Assets/Prefabs/obs5.prefab.meta

@@ -1,6 +1,6 @@
 fileFormatVersion: 2
-guid: 2b41929df6b82e94e80051911d01d2ef
-timeCreated: 1564714660
+guid: 3440b88baaccc864cbc9821c7d1eeb40
+timeCreated: 1565085015
 licenseType: Pro
 NativeFormatImporter:
   mainObjectFileID: 100100000

color3D_unity/color3D/Assets/Prefabs/obs_s.prefab.meta

@@ -0,0 +1,9 @@
+fileFormatVersion: 2
+guid: bf86c97164b41964aae50ba02c0f9f7a
+timeCreated: 1565081326
+licenseType: Pro
+NativeFormatImporter:
+  mainObjectFileID: 100100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

color3D_unity/color3D/Assets/Prefabs/player.prefab.meta

@@ -1,6 +1,6 @@
 fileFormatVersion: 2
 guid: 782c777a5ac90fb4f9b1bc0b76956971
-timeCreated: 1564713890
+timeCreated: 1565088033
 licenseType: Pro
 NativeFormatImporter:
   mainObjectFileID: 100100000

color3D_unity/color3D/Assets/Prefabs/prop1.prefab.meta

@@ -0,0 +1,9 @@
+fileFormatVersion: 2
+guid: 18dacc2329eaab54eb5cee298ab59760
+timeCreated: 1565080380
+licenseType: Pro
+NativeFormatImporter:
+  mainObjectFileID: 100100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

color3D_unity/color3D/Assets/Prefabs/prop2.prefab.meta

@@ -0,0 +1,9 @@
+fileFormatVersion: 2
+guid: bd33bea7eb8c80b4bb1d52cf8e591c88
+timeCreated: 1565081476
+licenseType: Pro
+NativeFormatImporter:
+  mainObjectFileID: 100100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

color3D_unity/color3D/Assets/Prefabs/prop3.prefab.meta

@@ -0,0 +1,9 @@
+fileFormatVersion: 2
+guid: 811e256e4f8b3de45af181c0dd32df0e
+timeCreated: 1565082251
+licenseType: Pro
+NativeFormatImporter:
+  mainObjectFileID: 100100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

color3D_unity/color3D/Library/CurrentLayout.dwlt

@@ -13,14 +13,14 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_PixelRect:
     serializedVersion: 2
-    x: 0
-    y: 42
+    x: 1930
+    y: 99
     width: 1920
     height: 998
   m_ShowMode: 4
   m_Title: 
   m_RootView: {fileID: 2}
-  m_MinSize: {x: 950, y: 300}
+  m_MinSize: {x: 950, y: 492}
   m_MaxSize: {x: 10000, y: 10000}
 --- !u!114 &2
 MonoBehaviour:
@@ -43,7 +43,7 @@ MonoBehaviour:
     y: 0
     width: 1920
     height: 998
-  m_MinSize: {x: 950, y: 300}
+  m_MinSize: {x: 950, y: 492}
   m_MaxSize: {x: 10000, y: 10000}
 --- !u!114 &3
 MonoBehaviour:
@@ -91,7 +91,7 @@ MonoBehaviour:
   m_MinSize: {x: 917, y: 442}
   m_MaxSize: {x: 22012, y: 10021}
   vertical: 0
-  controlID: 137
+  controlID: 21
 --- !u!114 &5
 MonoBehaviour:
   m_ObjectHideFlags: 52
@@ -135,7 +135,7 @@ MonoBehaviour:
   m_MinSize: {x: 202, y: 442}
   m_MaxSize: {x: 4002, y: 8042}
   vertical: 1
-  controlID: 47
+  controlID: 22
 --- !u!114 &7
 MonoBehaviour:
   m_ObjectHideFlags: 52
@@ -152,7 +152,7 @@ MonoBehaviour:
     serializedVersion: 2
     x: 1058
     y: 0
-    width: 246
+    width: 243
     height: 948
   m_MinSize: {x: 204, y: 221}
   m_MaxSize: {x: 4004, y: 4021}
@@ -175,9 +175,9 @@ MonoBehaviour:
   m_Children: []
   m_Position:
     serializedVersion: 2
-    x: 1304
+    x: 1301
     y: 0
-    width: 337
+    width: 340
     height: 948
   m_MinSize: {x: 234, y: 271}
   m_MaxSize: {x: 10004, y: 10021}
@@ -228,7 +228,7 @@ MonoBehaviour:
     x: 0
     y: 0
     width: 1058
-    height: 221
+    height: 713
   m_MinSize: {x: 202, y: 221}
   m_MaxSize: {x: 4002, y: 4021}
   m_ActualView: {fileID: 16}
@@ -251,9 +251,9 @@ MonoBehaviour:
   m_Position:
     serializedVersion: 2
     x: 0
-    y: 221
+    y: 713
     width: 1058
-    height: 727
+    height: 235
   m_MinSize: {x: 202, y: 221}
   m_MaxSize: {x: 4002, y: 4021}
   m_ActualView: {fileID: 15}
@@ -283,29 +283,29 @@ MonoBehaviour:
   m_DepthBufferBits: 0
   m_Pos:
     serializedVersion: 2
-    x: 1060
-    y: 91
-    width: 242
+    x: 2990
+    y: 148
+    width: 239
     height: 927
   m_TreeViewState:
     scrollPos: {x: 0, y: 0}
     m_SelectedIDs: 
     m_LastClickedID: 0
-    m_ExpandedIDs: e8fbffff00000000d62a0000162b00002e2b0000
+    m_ExpandedIDs: e8fbffff00000000
     m_RenameOverlay:
       m_UserAcceptedRename: 0
-      m_Name: road
-      m_OriginalName: road
+      m_Name: 
+      m_OriginalName: 
       m_EditFieldRect:
         serializedVersion: 2
         x: 0
         y: 0
         width: 0
         height: 0
-      m_UserData: 10976
+      m_UserData: 0
       m_IsWaitingForDelay: 0
       m_IsRenaming: 0
-      m_OriginalEventType: 0
+      m_OriginalEventType: 11
       m_IsRenamingFilename: 0
       m_ClientGUIView: {fileID: 7}
     m_SearchString: 
@@ -336,8 +336,8 @@ MonoBehaviour:
   m_DepthBufferBits: 0
   m_Pos:
     serializedVersion: 2
-    x: 1643
-    y: 91
+    x: 3573
+    y: 148
     width: 277
     height: 927
   m_ScrollPosition: {x: 0, y: 0}
@@ -369,9 +369,9 @@ MonoBehaviour:
   m_DepthBufferBits: 0
   m_Pos:
     serializedVersion: 2
-    x: 1306
-    y: 91
-    width: 333
+    x: 3233
+    y: 148
+    width: 336
     height: 927
   m_SearchFilter:
     m_NameFilter: 
@@ -384,19 +384,19 @@ MonoBehaviour:
     m_ShowAllHits: 0
     m_SearchArea: 0
     m_Folders:
-    - Assets/Prefabs
+    - Assets/Editor
   m_ViewMode: 1
   m_StartGridSize: 46
   m_LastFolders:
-  - Assets/Prefabs
+  - Assets/Editor
   m_LastFoldersGridSize: 46
   m_LastProjectPath: E:\Work\ColorBump3D\color3D\color3D_unity\color3D
   m_IsLocked: 0
   m_FolderTreeState:
     scrollPos: {x: 0, y: 0}
-    m_SelectedIDs: 96250000
-    m_LastClickedID: 9622
-    m_ExpandedIDs: 00000000f22400005c250000842500009625000098260000ac2600005827000020290000aa2a0000b22a0000d62b000000ca9a3bffffff7f
+    m_SelectedIDs: 5c250000
+    m_LastClickedID: 9564
+    m_ExpandedIDs: 00000000f22400005c25000084250000de260000f22600009e270000ac290000722b00007a2b00002c30000000ca9a3bffffff7f
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -424,7 +424,7 @@ MonoBehaviour:
     scrollPos: {x: 0, y: 0}
     m_SelectedIDs: 1239faff
     m_LastClickedID: 0
-    m_ExpandedIDs: 00000000f22400005c250000842500009625000098260000ac2600005827000020290000aa2a0000b22a0000d62b0000
+    m_ExpandedIDs: 00000000f22400005c25000084250000de260000f22600009e270000ac290000722b00007a2b00002c300000
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -451,7 +451,7 @@ MonoBehaviour:
   m_ListAreaState:
     m_SelectedInstanceIDs: 
     m_LastClickedInstanceID: 0
-    m_HadKeyboardFocusLastEvent: 1
+    m_HadKeyboardFocusLastEvent: 0
     m_ExpandedInstanceIDs: 20280000
     m_RenameOverlay:
       m_UserAcceptedRename: 0
@@ -476,9 +476,9 @@ MonoBehaviour:
       m_Icon: {fileID: 0}
       m_ResourceFile: 
     m_NewAssetIndexInList: -1
-    m_ScrollPosition: {x: 0, y: 106}
+    m_ScrollPosition: {x: 0, y: 0}
     m_GridSize: 46
-  m_DirectoriesAreaWidth: 209
+  m_DirectoriesAreaWidth: 155
 --- !u!114 &15
 MonoBehaviour:
   m_ObjectHideFlags: 52
@@ -501,10 +501,10 @@ MonoBehaviour:
   m_DepthBufferBits: 32
   m_Pos:
     serializedVersion: 2
-    x: 0
-    y: 312
+    x: 1930
+    y: 861
     width: 1056
-    height: 706
+    height: 214
   m_MaximizeOnPlay: 0
   m_Gizmos: 0
   m_Stats: 0
@@ -534,24 +534,24 @@ MonoBehaviour:
       x: 0
       y: 17
       width: 1056
-      height: 689
-    m_Scale: {x: 0.53828126, y: 0.53828126}
-    m_Translation: {x: 528, y: 344.5}
+      height: 197
+    m_Scale: {x: 0.15390626, y: 0.15390626}
+    m_Translation: {x: 528, y: 98.5}
     m_MarginLeft: 0
     m_MarginRight: 0
     m_MarginTop: 0
     m_MarginBottom: 0
     m_LastShownAreaInsideMargins:
       serializedVersion: 2
-      x: -980.89984
+      x: -3430.6597
       y: -640
-      width: 1961.7997
+      width: 6861.3193
       height: 1280
     m_MinimalGUI: 1
-  m_defaultScale: 0.53828126
+  m_defaultScale: 0.15390626
   m_TargetTexture: {fileID: 0}
   m_CurrentColorSpace: 0
-  m_LastWindowPixelSize: {x: 1056, y: 706}
+  m_LastWindowPixelSize: {x: 1056, y: 214}
   m_ClearInEditMode: 1
   m_NoCameraWarning: 1
   m_LowResolutionForAspectRatios: 01000000000100000100
@@ -577,19 +577,19 @@ MonoBehaviour:
   m_DepthBufferBits: 32
   m_Pos:
     serializedVersion: 2
-    x: 0
-    y: 91
+    x: 1930
+    y: 148
     width: 1056
-    height: 200
+    height: 692
   m_SceneLighting: 1
-  lastFramingTime: 27097.739895757426
+  lastFramingTime: 27529.716717481944
   m_2DMode: 0
   m_isRotationLocked: 0
   m_AudioPlay: 0
   m_Position:
-    m_Target: {x: -0.1009984, y: -16.11467, z: 23.977394}
+    m_Target: {x: 1.9405746, y: 5.2445483, z: 19.276016}
     speed: 2
-    m_Value: {x: -0.1009984, y: -16.11467, z: 23.977394}
+    m_Value: {x: 1.9405746, y: 5.2445483, z: 19.276016}
   m_RenderMode: 0
   m_ValidateTrueMetals: 0
   m_SceneViewState:
@@ -612,13 +612,13 @@ MonoBehaviour:
       speed: 2
       m_Value: 0
   m_Rotation:
-    m_Target: {x: -0.2215889, y: -0.6253279, z: 0.1916633, w: -0.7234223}
+    m_Target: {x: -0.21835442, y: 0.29713494, z: -0.06983529, w: -0.92691404}
     speed: 2
-    m_Value: {x: -0.2215655, y: -0.62526184, z: 0.19164306, w: -0.7233459}
+    m_Value: {x: -0.21835442, y: 0.29713494, z: -0.06983529, w: -0.92691404}
   m_Size:
-    m_Target: 81.59358
+    m_Target: 33.25446
     speed: 2
-    m_Value: 81.59358
+    m_Value: 33.25446
   m_Ortho:
     m_Target: 0
     speed: 2