xx 1 éve
szülő
commit
80026eabe2

+ 1 - 1
web-desktop/assets/main/config.json

@@ -1 +1 @@
-{"importBase":"import","nativeBase":"native","name":"main","deps":["resources"],"uuids":["07aa4fe73","0a139facc","0b+8pDtfJHloE6XsJAiGFu","3eiHjGv3pDDZVqZeGksdK9","88DhwQ7qBOw572PM8afR6i","0b+8pDtfJHloE6XsJAiGFu@6c48a","0b+8pDtfJHloE6XsJAiGFu@f9941","11vcSwZKhOt6Knn7niM+l3@f9941","15jn5SMiBM15aUcT4OboJ4@f9941","20g1ukYUVPvKWKBRznAKo+@f9941","26pO6TLtpHSI/kVYoptlaj","28dl4vBApMZY6M+dC7edhj@f9941","4c+tMe/4NB576dyCJt8KPX@f9941","4e9r4F751MzqYMeB4BFwm6","4e9r4F751MzqYMeB4BFwm6@6c48a","4e9r4F751MzqYMeB4BFwm6@f9941","54TknWPwVPqJqeCR+Y/Czo@f9941","57UgcWSMhKGYrPQcn4d3+w@f9941","5dRjnedX5EgqXzKhlj19Iv","60In2BSOpEOK4bSoXM/ClF@f9941","7dj5uJT9FMn6OrOOx83tfK@f9941","83hBLbj8FOf6N1rk6P4osN@f9941","95EkngnxZFbYuFpsqVTaFr@f9941","a9MZgBQOpDmpayqDXQ/egM","ae7ai4vtBEIIBCwCw+mPIw","afi62UvqJJtb+GgvRzeQmz","afxHkx8GZGsJC+n+YfITQo@f9941","b4BYE1SuROXZxBW42y9qQ8","b7MFJ8MjNBwqr3fNq1j5dJ@f9941","baIUdvKGZPgZxNbjWTFuRI","bdG8q6vX1KcbFDmXyII4Pk@f9941","e7ewqEbdxPWZ29WefyrOum","f0xess8p5A6pOMweQQHRIN","f1KiPEuSRDIqJgPZgkKPHo@f9941","fdjsU2o1RKF5x0TziDw3jI","ffuIqPr2JI9I8dPLYGRDpD@f9941"],"paths":{"3":["db:/assets/edit_game",0],"4":["db:/assets/preview",0],"29":["db:/internal/physics/default-physics-material",2],"34":["db:/internal/default_renderpipeline/builtin-forward",1]},"scenes":{"db://assets/edit_game.scene":3,"db://assets/preview.scene":4},"packs":{"07aa4fe73":["6","3","15"],"0a139facc":["5","14"]},"versions":{"import":[],"native":[]},"redirect":[7,"0",8,"0",9,"0",10,"0",11,"0",12,"0",16,"0",17,"0",18,"0",19,"0",20,"0",21,"0",22,"0",23,"0",24,"0",25,"0",26,"0",27,"0",28,"0",30,"0",31,"0",32,"0",33,"0",35,"0"],"debug":false,"extensionMap":{},"hasPreloadScript":true,"dependencyRelationships":{"3":["20","9","16","22","26","35","17","28","10","24","25","18","32","27","30","33","11","8","7","31","12","19","15","21","6","23"],"4":["33","11","26","35","28"],"5":["2"],"6":["5"],"14":["13"],"15":["14"]},"types":["cc.SceneAsset","cc.RenderPipeline","cc.PhysicsMaterial"]}
+{"importBase":"import","nativeBase":"native","name":"main","deps":["resources"],"uuids":["07aa4fe73","0a139facc","0b+8pDtfJHloE6XsJAiGFu","3eiHjGv3pDDZVqZeGksdK9","88DhwQ7qBOw572PM8afR6i","0b+8pDtfJHloE6XsJAiGFu@6c48a","0b+8pDtfJHloE6XsJAiGFu@f9941","11vcSwZKhOt6Knn7niM+l3@f9941","15jn5SMiBM15aUcT4OboJ4@f9941","20g1ukYUVPvKWKBRznAKo+@f9941","26pO6TLtpHSI/kVYoptlaj","28dl4vBApMZY6M+dC7edhj@f9941","4c+tMe/4NB576dyCJt8KPX@f9941","4e9r4F751MzqYMeB4BFwm6","4e9r4F751MzqYMeB4BFwm6@6c48a","4e9r4F751MzqYMeB4BFwm6@f9941","54TknWPwVPqJqeCR+Y/Czo@f9941","57UgcWSMhKGYrPQcn4d3+w@f9941","5dRjnedX5EgqXzKhlj19Iv","60In2BSOpEOK4bSoXM/ClF@f9941","7dj5uJT9FMn6OrOOx83tfK@f9941","83hBLbj8FOf6N1rk6P4osN@f9941","95EkngnxZFbYuFpsqVTaFr@f9941","a9MZgBQOpDmpayqDXQ/egM","ae7ai4vtBEIIBCwCw+mPIw","afi62UvqJJtb+GgvRzeQmz","afxHkx8GZGsJC+n+YfITQo@f9941","b4BYE1SuROXZxBW42y9qQ8","b7MFJ8MjNBwqr3fNq1j5dJ@f9941","baIUdvKGZPgZxNbjWTFuRI","bdG8q6vX1KcbFDmXyII4Pk@f9941","e7ewqEbdxPWZ29WefyrOum","f0xess8p5A6pOMweQQHRIN","f1KiPEuSRDIqJgPZgkKPHo@f9941","fdjsU2o1RKF5x0TziDw3jI","ffuIqPr2JI9I8dPLYGRDpD@f9941"],"paths":{"3":["db:/assets/edit_game",0],"4":["db:/assets/preview",0],"29":["db:/internal/physics/default-physics-material",2],"34":["db:/internal/default_renderpipeline/builtin-forward",1]},"scenes":{"db://assets/edit_game.scene":3,"db://assets/preview.scene":4},"packs":{"07aa4fe73":["6","3","15"],"0a139facc":["5","14"]},"versions":{"import":[],"native":[]},"redirect":[7,"0",8,"0",9,"0",10,"0",11,"0",12,"0",16,"0",17,"0",18,"0",19,"0",20,"0",21,"0",22,"0",23,"0",24,"0",25,"0",26,"0",27,"0",28,"0",30,"0",31,"0",32,"0",33,"0",35,"0"],"debug":false,"extensionMap":{},"hasPreloadScript":true,"dependencyRelationships":{"3":["20","9","16","22","26","35","17","28","10","32","18","24","25","27","30","33","11","8","7","31","12","19","15","21","6","23"],"4":["33","11","26","35","28"],"5":["2"],"6":["5"],"14":["13"],"15":["14"]},"types":["cc.SceneAsset","cc.RenderPipeline","cc.PhysicsMaterial"]}

A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 0 - 0
web-desktop/assets/main/import/07/07aa4fe73.json


A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 0 - 0
web-desktop/assets/main/index.js


A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 0 - 0
web-desktop/assets/resources/import/09/094e2f295.json


+ 1 - 1
web-desktop/assets/resources/import/ae/aeeda8b8-bed0-4420-8042-c02c3e98f230.json

@@ -1 +1 @@
-[1,["57UgcWSMhKGYrPQcn4d3+w@f9941"],["node","_spriteFrame","root","lab_name","img_icon","data"],[["cc.Node",["_name","_layer","_components","_prefab","_lpos","_children","_parent"],1,9,4,5,2,1],["cc.Prefab",["_name"],2],["cc.UITransform",["node","__prefab","_contentSize"],3,1,4,5],["cc.CompPrefabInfo",["fileId"],2],["cc.Sprite",["_sizeMode","node","__prefab","_spriteFrame"],2,1,4,6],["cc.PrefabInfo",["fileId","instance","targetOverrides","nestedPrefabInstanceRoots","root","asset"],-1,1,1],["cc.Label",["_string","_actualFontSize","_fontSize","_lineHeight","_overflow","_isBold","node","__prefab","_color"],-3,1,4,5],["cc.Widget",["_alignFlags","_originalWidth","node","__prefab"],1,1,4],["03aeePlEPZBlLCGigQHbnuB",["node","__prefab","img_icon","lab_name"],3,1,4,1,1]],[[3,0,2],[2,0,1,2,1],[5,0,1,2,3,4,5,5],[0,0,1,6,2,3,4,3],[7,0,1,2,3,3],[1,0,2],[0,0,1,5,2,3,4,3],[4,0,1,2,3,2],[6,0,1,2,3,4,5,6,7,8,7],[8,0,1,2,3,1]],[[5,"img_item"],[6,"img_item",33554432,[-7,-8],[[1,-2,[0,"39kb1aGJNE4r/QUkL3RCEr"],[5,1920,280]],[4,40,200,-3,[0,"7fuSMtfX1C84noh6kPFf5E"]],[9,-6,[0,"abUfiq/49E/JXF2BheVl9U"],-5,-4]],[2,"52P7EMX+pJRroWfb66/2k/",null,null,null,-1,0],[1,0,-140,0]],[3,"Label",33554432,1,[[1,-9,[0,"4b1SA843RPZ4m30fvqIqlz"],[5,1920,37.8]],[8,"土拍你土拍你",31,30,30,2,true,-10,[0,"ca4odoi8VC1p6Dc9qeVlQj"],[4,4278190080]],[4,40,90,-11,[0,"78EzQzvyBLZrCQNCSa9xKf"]]],[2,"38EW8bbDtC+pgbibfL5Z2E",null,null,null,1,0],[1,0,-103.346,0]],[3,"Sprite",33554432,1,[[1,-12,[0,"22MsyLNiVFB7NyPRViGUQC"],[5,200,200]],[7,0,-13,[0,"acnosFlp5GMqy/lqwJ/yX1"],0]],[2,"c9MgdpKMFJLZ8j06UB8xgR",null,null,null,1,0],[1,0,25.836,0]]],0,[0,2,1,0,0,1,0,0,1,0,3,2,0,4,3,0,0,1,0,-1,3,0,-2,2,0,0,2,0,0,2,0,0,2,0,0,3,0,0,3,0,5,1,13],[0],[1],[0]]
+[1,["57UgcWSMhKGYrPQcn4d3+w@f9941"],["node","_spriteFrame","root","lab_name","img_icon","data"],[["cc.Node",["_name","_layer","_components","_prefab","_lpos","_children","_parent"],1,9,4,5,2,1],["cc.Widget",["_alignFlags","_originalWidth","_enabled","node","__prefab"],0,1,4],["cc.Prefab",["_name"],2],["cc.UITransform",["node","__prefab","_contentSize"],3,1,4,5],["cc.CompPrefabInfo",["fileId"],2],["cc.Sprite",["_sizeMode","node","__prefab","_spriteFrame"],2,1,4,6],["cc.PrefabInfo",["fileId","instance","targetOverrides","nestedPrefabInstanceRoots","root","asset"],-1,1,1],["cc.Label",["_string","_actualFontSize","_fontSize","_lineHeight","_overflow","_isBold","node","__prefab","_color"],-3,1,4,5],["03aeePlEPZBlLCGigQHbnuB",["node","__prefab","img_icon","lab_name"],3,1,4,1,1]],[[4,0,2],[3,0,1,2,1],[6,0,1,2,3,4,5,5],[0,0,1,6,2,3,4,3],[2,0,2],[0,0,1,5,2,3,4,3],[5,0,1,2,3,2],[7,0,1,2,3,4,5,6,7,8,7],[1,0,1,3,4,3],[1,2,0,1,3,4,4],[8,0,1,2,3,1]],[[4,"img_item"],[5,"img_item",33554432,[-7,-8],[[1,-2,[0,"39kb1aGJNE4r/QUkL3RCEr"],[5,280,280]],[9,false,40,200,-3,[0,"7fuSMtfX1C84noh6kPFf5E"]],[10,-6,[0,"abUfiq/49E/JXF2BheVl9U"],-5,-4]],[2,"52P7EMX+pJRroWfb66/2k/",null,null,null,-1,0],[1,0,-140,0]],[3,"Label",33554432,1,[[1,-9,[0,"4b1SA843RPZ4m30fvqIqlz"],[5,280,37.8]],[7,"土拍你土拍你",31,30,30,2,true,-10,[0,"ca4odoi8VC1p6Dc9qeVlQj"],[4,4278190080]],[8,40,90,-11,[0,"78EzQzvyBLZrCQNCSa9xKf"]]],[2,"38EW8bbDtC+pgbibfL5Z2E",null,null,null,1,0],[1,0,-103.346,0]],[3,"Sprite",33554432,1,[[1,-12,[0,"22MsyLNiVFB7NyPRViGUQC"],[5,200,200]],[6,0,-13,[0,"acnosFlp5GMqy/lqwJ/yX1"],0]],[2,"c9MgdpKMFJLZ8j06UB8xgR",null,null,null,1,0],[1,0,25.836,0]]],0,[0,2,1,0,0,1,0,0,1,0,3,2,0,4,3,0,0,1,0,-1,3,0,-2,2,0,0,2,0,0,2,0,0,2,0,0,3,0,0,3,0,5,1,13],[0],[1],[0]]

A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 0 - 0
web-desktop/assets/resources/import/af/af8bad94-bea2-49b5-bf86-82f4737909b3.json


Nem az összes módosított fájl került megjelenítésre, mert túl sok fájl változott