update v1.8.2

RageOfFire · Apr 6, 2023 · d888290 · d888290
1 parent a34fd04
commit d888290
Show file tree

Hide file tree

Showing 14 changed files with 2,103 additions and 4,249 deletions.
diff --git a/CrystalGem-Game/www/data/Map004.json b/CrystalGem-Game/www/data/Map004.json
diff --git a/CrystalGem-Game/www/data/Map040.json b/CrystalGem-Game/www/data/Map040.json
diff --git a/CrystalGem-Game/www/data/Map094.json b/CrystalGem-Game/www/data/Map094.json
diff --git a/CrystalGem-Game/www/data/Map095.json b/CrystalGem-Game/www/data/Map095.json
@@ -3,7 +3,7 @@
 "data":[1544,1544,1544,1544,1544,1544,1544,1544,1544,1544,1544,1544,1544,1544,1544,1544,1544,1544,1544,1544,1544,1544,1544,1544,1544,1544,1544,1544,1544,1544,1544,1544,1544,1544,1544,1544,1544,1544,1538,1538,1538,1538,1538,1538,1538,1538,1538,1544,1544,1544,1544,1544,1544,1544,1544,1538,1538,1538,1538,1538,1538,1538,1538,1538,1544,1544,1544,1544,1544,1544,1544,1544,1538,1538,1538,1538,1538,1538,1538,1538,1538,1544,1544,1544,1544,1544,1544,1544,1544,1538,1538,1538,1538,1538,1538,1538,1538,1538,1544,1544,1544,1544,1544,1544,1544,1544,1538,1538,1538,1538,1538,1538,1538,1538,1538,1544,1544,1544,1544,1544,1544,1544,1544,1538,1538,1538,1538,1538,1538,1538,1538,1538,1544,1544,1544,1544,1544,1544,1544,1544,1538,1538,1538,1538,1538,1538,1538,1538,1538,1544,1544,1544,1544,1544,1544,1544,1544,1538,1538,1538,1538,1538,1538,1538,1538,1538,1544,1544,1544,1544,1544,1544,1544,1544,1546,1546,1546,1546,1546,1546,1546,1546,1546,1544,1544,1544,1544,1544,1544,1544,1544,1544,1544,1544,1544,1544,1544,1544,1544,1544,1544,1544,1544,1544,1544,1544,1544,1544,1544,1544,1544,1544,1544,1544,1544,1544,1544,1544,1544,1544,1544,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],
 "events":[
 null,
-{"id":1,"name":"EV001","note":"","pages":[{"conditions":{"actorId":1,"actorValid":false,"itemId":1,"itemValid":false,"selfSwitchCh":"A","selfSwitchValid":false,"switch1Id":1,"switch1Valid":false,"switch2Id":1,"switch2Valid":false,"variableId":1,"variableValid":false,"variableValue":0},"directionFix":false,"image":{"tileId":0,"characterName":"Isle","direction":2,"pattern":1,"characterIndex":0},"list":[{"code":101,"indent":0,"parameters":["",0,1,1]},{"code":401,"indent":0,"parameters":["\\c[3]         Bạn có muốn xem qua hướng dẫn không ?"]},{"code":102,"indent":0,"parameters":[["Có","Không"],1,0,1,1]},{"code":402,"indent":0,"parameters":[0,"Có"]},{"code":213,"indent":1,"parameters":[0,4,true]},{"code":101,"indent":1,"parameters":["Isle",0,0,2]},{"code":401,"indent":1,"parameters":["\\C[14]\\N[38]:\\C[0]"]},{"code":401,"indent":1,"parameters":["Để bắt đầu hướng dẫn hay di chuyển tới"]},{"code":401,"indent":1,"parameters":["tương tác với tôi !"]},{"code":123,"indent":1,"parameters":["A",0]},{"code":0,"indent":1,"parameters":[]},{"code":402,"indent":0,"parameters":[1,"Không"]},{"code":101,"indent":1,"parameters":["Isle",0,0,2]},{"code":401,"indent":1,"parameters":["\\C[14]\\N[38]:\\C[0]"]},{"code":401,"indent":1,"parameters":["Chúc bạn may mắn !"]},{"code":211,"indent":1,"parameters":[0]},{"code":201,"indent":1,"parameters":[0,5,16,12,6,0]},{"code":0,"indent":1,"parameters":[]},{"code":404,"indent":0,"parameters":[]},{"code":0,"indent":0,"parameters":[]}],"moveFrequency":3,"moveRoute":{"list":[{"code":0,"parameters":[]}],"repeat":true,"skippable":false,"wait":false},"moveSpeed":3,"moveType":0,"priorityType":1,"stepAnime":false,"through":false,"trigger":3,"walkAnime":true},{"conditions":{"actorId":1,"actorValid":false,"itemId":1,"itemValid":false,"selfSwitchCh":"A","selfSwitchValid":true,"switch1Id":1,"switch1Valid":false,"switch2Id":1,"switch2Valid":false,"variableId":1,"variableValid":false,"variableValue":0},"directionFix":false,"image":{"tileId":0,"characterName":"Isle","direction":2,"pattern":1,"characterIndex":0},"list":[{"code":126,"indent":0,"parameters":[1,0,0,1]},{"code":101,"indent":0,"parameters":["Isle",0,0,2]},{"code":401,"indent":0,"parameters":["\\C[14]\\N[38]:\\C[0]"]},{"code":401,"indent":0,"parameters":["Ở trong phần hướng dẫn này tôi sẽ hướng"]},{"code":401,"indent":0,"parameters":["dẫn bạn sử dụng 1 số chức năng cơ bản !"]},{"code":101,"indent":0,"parameters":["Isle",0,0,2]},{"code":401,"indent":0,"parameters":["\\C[14]\\N[38]:\\C[0]"]},{"code":401,"indent":0,"parameters":["Chúng ta vào phần hướng dẫn nhé !"]},{"code":301,"indent":0,"parameters":[0,60,false,false]},{"code":211,"indent":0,"parameters":[0]},{"code":201,"indent":0,"parameters":[0,5,16,12,6,0]},{"code":0,"indent":0,"parameters":[]}],"moveFrequency":3,"moveRoute":{"list":[{"code":0,"parameters":[]}],"repeat":true,"skippable":false,"wait":false},"moveSpeed":3,"moveType":0,"priorityType":1,"stepAnime":false,"through":false,"trigger":0,"walkAnime":true}],"x":8,"y":3},
+{"id":1,"name":"EV001","note":"","pages":[{"conditions":{"actorId":1,"actorValid":false,"itemId":1,"itemValid":false,"selfSwitchCh":"A","selfSwitchValid":false,"switch1Id":1,"switch1Valid":false,"switch2Id":1,"switch2Valid":false,"variableId":1,"variableValid":false,"variableValue":0},"directionFix":false,"image":{"tileId":0,"characterName":"Isle","direction":2,"pattern":1,"characterIndex":0},"list":[{"code":205,"indent":0,"parameters":[-1,{"list":[{"code":19,"indent":null},{"code":0}],"repeat":false,"skippable":false,"wait":true}]},{"code":505,"indent":0,"parameters":[{"code":19,"indent":null}]},{"code":101,"indent":0,"parameters":["",0,1,1]},{"code":401,"indent":0,"parameters":["\\c[3]         Bạn có muốn xem qua hướng dẫn không ?"]},{"code":102,"indent":0,"parameters":[["Có","Không"],1,0,1,1]},{"code":402,"indent":0,"parameters":[0,"Có"]},{"code":213,"indent":1,"parameters":[0,4,true]},{"code":101,"indent":1,"parameters":["Isle",0,0,2]},{"code":401,"indent":1,"parameters":["\\C[14]\\N[38]:\\C[0]"]},{"code":401,"indent":1,"parameters":["Để bắt đầu hướng dẫn hay di chuyển tới"]},{"code":401,"indent":1,"parameters":["tương tác với tôi !"]},{"code":123,"indent":1,"parameters":["A",0]},{"code":0,"indent":1,"parameters":[]},{"code":402,"indent":0,"parameters":[1,"Không"]},{"code":101,"indent":1,"parameters":["Isle",0,0,2]},{"code":401,"indent":1,"parameters":["\\C[14]\\N[38]:\\C[0]"]},{"code":401,"indent":1,"parameters":["Chúc bạn may mắn !"]},{"code":211,"indent":1,"parameters":[0]},{"code":201,"indent":1,"parameters":[0,5,16,12,6,0]},{"code":0,"indent":1,"parameters":[]},{"code":404,"indent":0,"parameters":[]},{"code":0,"indent":0,"parameters":[]}],"moveFrequency":3,"moveRoute":{"list":[{"code":0,"parameters":[]}],"repeat":true,"skippable":false,"wait":false},"moveSpeed":3,"moveType":0,"priorityType":1,"stepAnime":false,"through":false,"trigger":3,"walkAnime":true},{"conditions":{"actorId":1,"actorValid":false,"itemId":1,"itemValid":false,"selfSwitchCh":"A","selfSwitchValid":true,"switch1Id":1,"switch1Valid":false,"switch2Id":1,"switch2Valid":false,"variableId":1,"variableValid":false,"variableValue":0},"directionFix":false,"image":{"tileId":0,"characterName":"Isle","direction":2,"pattern":1,"characterIndex":0},"list":[{"code":126,"indent":0,"parameters":[1,0,0,1]},{"code":101,"indent":0,"parameters":["Isle",0,0,2]},{"code":401,"indent":0,"parameters":["\\C[14]\\N[38]:\\C[0]"]},{"code":401,"indent":0,"parameters":["Ở trong phần hướng dẫn này tôi sẽ hướng"]},{"code":401,"indent":0,"parameters":["dẫn bạn sử dụng 1 số chức năng cơ bản !"]},{"code":101,"indent":0,"parameters":["Isle",0,0,2]},{"code":401,"indent":0,"parameters":["\\C[14]\\N[38]:\\C[0]"]},{"code":401,"indent":0,"parameters":["Chúng ta vào phần hướng dẫn nhé !"]},{"code":301,"indent":0,"parameters":[0,60,false,false]},{"code":211,"indent":0,"parameters":[0]},{"code":201,"indent":0,"parameters":[0,5,16,12,6,0]},{"code":0,"indent":0,"parameters":[]}],"moveFrequency":3,"moveRoute":{"list":[{"code":0,"parameters":[]}],"repeat":true,"skippable":false,"wait":false},"moveSpeed":3,"moveType":0,"priorityType":1,"stepAnime":false,"through":false,"trigger":0,"walkAnime":true}],"x":8,"y":3},
 null
 ]
 }
diff --git a/CrystalGem-Game/www/data/MapInfos.json b/CrystalGem-Game/www/data/MapInfos.json
@@ -1,9 +1,9 @@
 [
 null,
 {"id":1,"expanded":false,"name":"Normal Town","order":32,"parentId":0,"scrollX":1165.0909090909092,"scrollY":654.5454545454546},
-{"id":2,"expanded":false,"name":"World 3","order":2,"parentId":0,"scrollX":3320.727272727273,"scrollY":1629.818181818182},
-{"id":3,"expanded":false,"name":"Begin","order":1,"parentId":0,"scrollX":451,"scrollY":337.5},
-{"id":4,"expanded":false,"name":"Swamp","order":3,"parentId":2,"scrollX":1165.0909090909092,"scrollY":654.5454545454546},
+{"id":2,"expanded":false,"name":"World 3","order":2,"parentId":0,"scrollX":3320.3999999999996,"scrollY":1630.1999999999998},
+{"id":3,"expanded":false,"name":"Begin","order":1,"parentId":0,"scrollX":550.8,"scrollY":343.8},
+{"id":4,"expanded":false,"name":"Swamp","order":3,"parentId":2,"scrollX":1028.3999999999999,"scrollY":493.79999999999995},
 {"id":5,"expanded":false,"name":"Intro","order":18,"parentId":0,"scrollX":550.8,"scrollY":343.8},
 {"id":6,"expanded":false,"name":"Inn 1F","order":33,"parentId":1,"scrollX":1182.5454545454545,"scrollY":654.5454545454546},
 {"id":7,"expanded":false,"name":"Item Shop","order":34,"parentId":1,"scrollX":2365.090909090909,"scrollY":1330.909090909091},
@@ -14,7 +14,7 @@ null,
 {"id":12,"expanded":false,"name":"House 1","order":39,"parentId":1,"scrollX":2365.090909090909,"scrollY":1330.909090909091},
 {"id":13,"expanded":false,"name":"House 2","order":40,"parentId":1,"scrollX":2365.090909090909,"scrollY":1330.909090909091},
 {"id":14,"expanded":false,"name":"Mansion","order":41,"parentId":1,"scrollX":1165.0909090909092,"scrollY":879.2727272727273},
-{"id":15,"expanded":false,"name":"PictureStore","order":92,"parentId":0,"scrollX":459,"scrollY":286.5},
+{"id":15,"expanded":false,"name":"PictureStore","order":92,"parentId":0,"scrollX":648,"scrollY":359.4},
 {"id":16,"expanded":false,"name":"Forest Town","order":19,"parentId":0,"scrollX":1165.0909090909092,"scrollY":1265.4545454545455},
 {"id":17,"expanded":false,"name":"Kora House","order":20,"parentId":16,"scrollX":1182.5454545454545,"scrollY":654.5454545454546},
 {"id":18,"expanded":false,"name":"Item Shop","order":21,"parentId":16,"scrollX":1182.5454545454545,"scrollY":654.5454545454546},
@@ -39,7 +39,7 @@ null,
 {"id":37,"expanded":false,"name":"Mansion","order":52,"parentId":0,"scrollX":1165.0909090909092,"scrollY":1265.4545454545455},
 {"id":38,"expanded":false,"name":"Item Shop","order":50,"parentId":30,"scrollX":1182.5454545454545,"scrollY":665.4545454545455},
 {"id":39,"expanded":false,"name":"Mansion","order":51,"parentId":30,"scrollX":1165.0909090909092,"scrollY":654.5454545454546},
-{"id":40,"expanded":false,"name":"Burning Town","order":53,"parentId":0,"scrollX":1165.0909090909092,"scrollY":735.2727272727273},
+{"id":40,"expanded":false,"name":"Burning Town","order":53,"parentId":0,"scrollX":638.4,"scrollY":838.1999999999999},
 {"id":41,"expanded":false,"name":"Lost Forest 1","order":6,"parentId":2,"scrollX":1714.909090909091,"scrollY":1104},
 {"id":42,"expanded":false,"name":"Lost Forest 2","order":7,"parentId":2,"scrollX":1566.6666666666667,"scrollY":832.6666666666666},
 {"id":43,"expanded":false,"name":"Lost Forest 3","order":8,"parentId":2,"scrollX":1280.7272727272727,"scrollY":713.4545454545455},
@@ -92,7 +92,7 @@ null,
 {"id":90,"expanded":false,"name":"Demon Castle 3","order":90,"parentId":87,"scrollX":1165.0909090909092,"scrollY":1025.4545454545455},
 {"id":91,"expanded":false,"name":"Ending","order":91,"parentId":0,"scrollX":1182.5454545454545,"scrollY":654.5454545454546},
 {"id":92,"expanded":false,"name":"OutSpace","order":17,"parentId":2,"scrollX":1182.5454545454545,"scrollY":654.5454545454546},
-{"id":93,"expanded":false,"name":"MAP093","order":93,"parentId":15,"scrollX":1182.5454545454545,"scrollY":655.6363636363636},
-{"id":94,"expanded":false,"name":"Floating Temple","order":94,"parentId":15,"scrollX":1165.0909090909092,"scrollY":655.6363636363636},
-{"id":95,"expanded":false,"name":"Tutorial","order":95,"parentId":0,"scrollX":550.8,"scrollY":343.8}
+{"id":93,"expanded":false,"name":"MAP093","order":93,"parentId":15,"scrollX":648,"scrollY":359.4},
+null,
+{"id":95,"expanded":false,"name":"Tutorial","order":94,"parentId":0,"scrollX":648,"scrollY":359.4}
 ]