Compare commits
3 Commits
ab2255db29
...
087c1bdbca
| Author | SHA1 | Date |
|---|---|---|
unfaiyted
|
087c1bdbca | |
|
unfaiyted
|
bf51233ffc | |
|
unfaiyted
|
854d54644e |
|
|
@ -3220,6 +3220,553 @@
|
|||
<object id="1" x="0" y="0" width="32" height="32"/>
|
||||
</objectgroup>
|
||||
</tile>
|
||||
<tile id="2545">
|
||||
<objectgroup draworder="index" id="2">
|
||||
<object id="1" x="3.0622" y="31.983">
|
||||
<polygon points="0,0 -0.255183,-5.01861 8.7613,-17.3525 15.0558,-24.1574 22.0308,-29.0909 28.9208,-29.3461 28.9208,-15.9064 24.6677,-6.20946 23.5619,-3.99787 14.7156,0"/>
|
||||
</object>
|
||||
</objectgroup>
|
||||
</tile>
|
||||
<tile id="2546">
|
||||
<objectgroup draworder="index" id="2">
|
||||
<object id="1" x="3.0622" y="0.0850611">
|
||||
<polygon points="0,0 15.1409,-0.170122 21.8607,4.67836 21.8607,6.63477 15.9915,10.8878 10.7177,14.2052 8.67624,16.757 3.91281,18.2881 -0.255183,15.9915 -3.23232,12.589 -3.0622,2.38171"/>
|
||||
</object>
|
||||
</objectgroup>
|
||||
</tile>
|
||||
<tile id="2548">
|
||||
<objectgroup draworder="index" id="2">
|
||||
<object id="1" x="16.3317" y="0.0850611">
|
||||
<polygon points="0,0 13.6948,-0.170122 15.6512,1.78628 15.7363,12.0787 7.57044,18.118 2.6369,18.7985 -0.76555,14.5455 -7.74056,9.78203 -7.57044,8.7613 -2.72196,0.76555 -0.595428,0"/>
|
||||
</object>
|
||||
</objectgroup>
|
||||
</tile>
|
||||
<tile id="2549">
|
||||
<objectgroup draworder="index" id="2">
|
||||
<object id="1" x="0" y="3.14726">
|
||||
<polygon points="0,0 6.03934,-0.340245 9.69697,2.55183 18.8836,7.82562 26.7943,15.6512 29.9415,25.6885 30.0266,28.6656 11.7384,28.7507 6.88995,27.9001 5.6991,26.454 -0.0850611,7.40032"/>
|
||||
</object>
|
||||
</objectgroup>
|
||||
</tile>
|
||||
<tile id="2550">
|
||||
<objectgroup draworder="index" id="2">
|
||||
<object id="1" x="10.8028" y="0.0850611">
|
||||
<polygon points="0,0 21.0101,0.0850611 21.0952,30.7921 20.1595,31.8979 0,31.7278 -0.76555,28.6656 -2.04147,23.9022 -3.14726,20.0744 -1.78628,16.5019"/>
|
||||
</object>
|
||||
</objectgroup>
|
||||
</tile>
|
||||
<tile id="2551">
|
||||
<objectgroup draworder="index" id="2">
|
||||
<object id="1" x="10.9729" y="0.0850611">
|
||||
<polygon points="0,0 21.0101,-0.170122 21.0952,31.7278 -0.255183,31.7278 -1.10579,28.5805 -3.31738,20.6699 -2.21159,16.757 2.04147,8.84636 -0.340245,1.70122"/>
|
||||
</object>
|
||||
</objectgroup>
|
||||
</tile>
|
||||
<tile id="2552">
|
||||
<objectgroup draworder="index" id="2">
|
||||
<object id="1" x="19.0537" y="0.255183">
|
||||
<polygon points="0,0 -19.1388,-0.170122 -19.0537,25.6885 -18.2031,29.4312 -17.2674,31.5577 -5.27379,31.5577 4.93355,29.8565 7.99575,25.6034 8.93142,13.7799 5.78416,6.46465"/>
|
||||
</object>
|
||||
</objectgroup>
|
||||
</tile>
|
||||
<tile id="2553">
|
||||
<objectgroup draworder="index" id="2">
|
||||
<object id="1" x="19.0537" y="0.170122">
|
||||
<polygon points="0,0 -19.2238,0.0850611 -19.1388,25.4333 -18.2031,29.4312 -17.0973,31.4726 -5.27379,31.8129 0.935673,30.7071 4.93355,29.7714 8.08081,25.5183 8.93142,13.7799 5.61404,6.63477"/>
|
||||
</object>
|
||||
</objectgroup>
|
||||
</tile>
|
||||
<tile id="2554">
|
||||
<objectgroup draworder="index" id="2">
|
||||
<object id="1" x="14.1201" y="31.8979">
|
||||
<polygon points="0,0 -14.2903,0.170122 -14.2052,-32.1531 4.67836,-31.8979 7.91069,-27.7299 10.6326,-24.8379 13.7799,-18.2031 12.7592,-7.82562 12.7592,-6.1244 9.95215,-2.04147 5.78416,-1.10579"/>
|
||||
</object>
|
||||
</objectgroup>
|
||||
</tile>
|
||||
<tile id="2555">
|
||||
<objectgroup draworder="index" id="2">
|
||||
<object id="1" x="10.8878" y="0.0850611">
|
||||
<polygon points="0,0 21.0952,0.0850611 21.0952,31.8129 0.170122,31.8129 -0.935673,28.6656 -2.04147,24.3275 -2.97714,20.6699 -2.04147,16.2467 1.95641,12.8442 -0.0850611,1.78628"/>
|
||||
</object>
|
||||
</objectgroup>
|
||||
</tile>
|
||||
<tile id="2556">
|
||||
<objectgroup draworder="index" id="2">
|
||||
<object id="1" x="17.0973" y="32.3232">
|
||||
<polygon points="0,0 -17.3525,-0.255183 -17.1823,-32.3232 14.8857,-32.2382 14.7156,-16.3317 12.9293,-11.5683 6.71983,-2.72196"/>
|
||||
</object>
|
||||
</objectgroup>
|
||||
</tile>
|
||||
<tile id="2557">
|
||||
<objectgroup draworder="index" id="2">
|
||||
<object id="1" x="-0.170122" y="10.9729">
|
||||
<polygon points="0,0 0.170122,-7.91069 2.29665,-11.0579 32.1531,-11.0579 32.068,14.9708 30.1967,20.6699 12.0787,21.0101 7.06007,19.9043 5.61404,19.0537 5.6991,16.8421 10.0372,14.2052 7.14514,7.74056 6.88995,3.99787 1.78628,1.87135"/>
|
||||
</object>
|
||||
</objectgroup>
|
||||
</tile>
|
||||
<tile id="2558">
|
||||
<objectgroup draworder="index" id="2">
|
||||
<object id="1" x="-0.170122" y="28.1552">
|
||||
<polygon points="0,0 0.170122,-28.3254 30.1967,-27.9851 32.1531,-25.1781 32.068,-12.0787 29.5162,-9.1866 28.0702,-2.6369 27.2196,-0.340245 19.8192,1.95641 18.3732,3.82775 4.25306,3.57257"/>
|
||||
</object>
|
||||
</objectgroup>
|
||||
</tile>
|
||||
<tile id="2559">
|
||||
<objectgroup draworder="index" id="2">
|
||||
<object id="1" x="0.0850611" y="14.2903">
|
||||
<polygon points="0,0 -0.0850611,-12.2488 1.87135,-14.0351 31.8129,-14.3753 31.8979,-0.510367 28.0702,5.35885 22.8814,7.6555 13.0144,9.69697 9.95215,9.69697 7.06007,8.59117"/>
|
||||
</object>
|
||||
</objectgroup>
|
||||
</tile>
|
||||
<tile id="2560">
|
||||
<objectgroup draworder="index" id="2">
|
||||
<object id="1" x="-0.0850611" y="14.5455">
|
||||
<polygon points="0,0 0.170122,-14.4604 29.9415,-14.5455 31.983,-12.504 32.068,-0.935673 29.0909,1.27592 27.6449,5.18873 22.9665,7.57044 12.9293,9.69697 10.2924,9.69697 6.71983,8.25093"/>
|
||||
</object>
|
||||
</objectgroup>
|
||||
</tile>
|
||||
<tile id="2600">
|
||||
<objectgroup draworder="index" id="2">
|
||||
<object id="1" x="-0.340245" y="4.25306">
|
||||
<polygon points="0,0 2.12653,-4.33812 19.3089,-4.33812 25.093,2.46677 28.4955,10.3775 27.3046,21.3503 24.2424,25.6034 20.0744,26.7943 14.0351,27.6449 1.02073,27.4747 0.340245,10.3775"/>
|
||||
</object>
|
||||
</objectgroup>
|
||||
</tile>
|
||||
<tile id="2604">
|
||||
<objectgroup draworder="index" id="2">
|
||||
<object id="1" x="10.7177" y="0">
|
||||
<polygon points="0,0 20.2446,0 21.2653,2.97714 21.0952,13.95 21.2653,30.7921 20.4147,31.8129 0,31.8979 -0.935673,28.5805 -2.89208,19.9043 -1.78628,16.5019 2.38171,8.93142 -0.0850611,2.21159"/>
|
||||
</object>
|
||||
</objectgroup>
|
||||
</tile>
|
||||
<tile id="2605">
|
||||
<objectgroup draworder="index" id="2">
|
||||
<object id="1" x="0" y="11.8235">
|
||||
<polygon points="0,0 -0.0850611,-12.1637 31.8979,-11.7384 31.983,15.3961 30.1116,19.9043 11.5683,20.0744 6.80489,19.0537 5.61404,17.7778 6.88995,5.86922"/>
|
||||
</object>
|
||||
</objectgroup>
|
||||
</tile>
|
||||
<tile id="2606">
|
||||
<objectgroup draworder="index" id="2">
|
||||
<object id="1" x="0.0850611" y="11.143">
|
||||
<polygon points="0,0 -0.170122,-11.3131 31.7278,-11.0579 31.7278,15.5662 29.9415,20.925 17.5226,20.7549 7.6555,16.4168 4.93355,14.8006 3.48751,13.5247 3.91281,2.89208 1.95641,1.95641"/>
|
||||
</object>
|
||||
</objectgroup>
|
||||
</tile>
|
||||
<tile id="2607">
|
||||
<objectgroup draworder="index" id="2">
|
||||
<object id="1" x="31.983" y="15.9915">
|
||||
<polygon points="0,0 -0.0850611,-16.1616 -32.1531,-15.9064 -32.068,9.69697 -28.4104,15.5662 -14.1201,15.6512 -4.84848,11.8235 -4.08293,9.61191"/>
|
||||
</object>
|
||||
</objectgroup>
|
||||
</tile>
|
||||
<tile id="2608">
|
||||
<objectgroup draworder="index" id="2">
|
||||
<object id="1" x="32.1531" y="16.3317">
|
||||
<polygon points="0,0 -0.255183,-16.672 -32.2382,-16.2467 -32.1531,9.35673 -29.3461,15.311 -15.311,15.311 -8.25093,13.3546 -2.21159,4.42318"/>
|
||||
</object>
|
||||
</objectgroup>
|
||||
</tile>
|
||||
<tile id="2609">
|
||||
<objectgroup draworder="index" id="2">
|
||||
<object id="1" x="18.7135" y="0.170122">
|
||||
<polygon points="0,0 -18.6284,-0.170122 -18.7135,25.7735 -16.9272,31.4726 -4.5933,31.5577 5.44391,29.5162 8.25093,25.9436 9.35673,14.0351 5.95428,6.29452"/>
|
||||
</object>
|
||||
</objectgroup>
|
||||
</tile>
|
||||
<tile id="2610">
|
||||
<objectgroup draworder="index" id="2">
|
||||
<object id="1" x="10.6326" y="0.170122">
|
||||
<polygon points="0,0 21.2653,-0.255183 21.2653,31.8129 0,31.8129 -0.850611,28.3254 -2.89208,19.9894"/>
|
||||
</object>
|
||||
</objectgroup>
|
||||
</tile>
|
||||
<tile id="2611">
|
||||
<objectgroup draworder="index" id="2">
|
||||
<object id="1" x="0" y="11.3131">
|
||||
<polygon points="0,0 -0.170122,-11.2281 32.068,-11.2281 32.068,20.6699 11.5683,20.6699 6.46465,19.479 5.44391,18.4583 6.71983,6.88995"/>
|
||||
</object>
|
||||
</objectgroup>
|
||||
</tile>
|
||||
<tile id="2612">
|
||||
<objectgroup draworder="index" id="2">
|
||||
<object id="1" x="0.0850611" y="11.2281">
|
||||
<polygon points="0,0 0,-9.35673 1.78628,-11.143 31.8129,-11.3131 31.7278,14.8006 29.9415,20.7549 17.8628,20.5848 7.57044,16.5869 3.57257,13.4397 3.74269,10.2924"/>
|
||||
</object>
|
||||
</objectgroup>
|
||||
</tile>
|
||||
<tile id="2613">
|
||||
<objectgroup draworder="index" id="2">
|
||||
<object id="1" x="0.170122" y="28.1552">
|
||||
<polygon points="0,0 -0.0850611,-28.1552 29.7714,-27.9851 31.7278,-25.5183 31.8129,-12.2488 29.6863,-7.40032 23.7321,1.27592 16.757,3.91281 2.72196,3.48751"/>
|
||||
</object>
|
||||
</objectgroup>
|
||||
</tile>
|
||||
<tile id="2614">
|
||||
<objectgroup draworder="index" id="2">
|
||||
<object id="1" x="20.925" y="0.170122">
|
||||
<polygon points="0,0 -20.925,0.0850611 -20.7549,27.815 -19.9043,31.7278 11.143,31.8129 10.8028,7.74056"/>
|
||||
</object>
|
||||
</objectgroup>
|
||||
</tile>
|
||||
<tile id="2615">
|
||||
<objectgroup draworder="index" id="2">
|
||||
<object id="1" x="11.9086" y="0">
|
||||
<polygon points="0,0 19.9894,0.0850611 19.9894,28.0702 17.1823,31.8979 -12.0787,32.068 -11.9936,6.80489"/>
|
||||
</object>
|
||||
</objectgroup>
|
||||
</tile>
|
||||
<tile id="2655">
|
||||
<objectgroup draworder="index" id="2">
|
||||
<object id="1" x="21.0952" y="0">
|
||||
<polygon points="0,0 -19.2238,0 -20.1595,2.80702 -20.0744,31.8129 10.9729,31.8979 10.8028,7.57044"/>
|
||||
</object>
|
||||
</objectgroup>
|
||||
</tile>
|
||||
<tile id="2656">
|
||||
<objectgroup draworder="index" id="2">
|
||||
<object id="1" x="0" y="5.18873">
|
||||
<polygon points="0,0 -0.0850611,26.7943 18.7985,26.7943 21.9458,25.6885 26.1138,19.6491 26.1138,18.6284 22.5412,6.20946 13.4397,-0.425306"/>
|
||||
</object>
|
||||
</objectgroup>
|
||||
</tile>
|
||||
<tile id="2658">
|
||||
<objectgroup draworder="index" id="2">
|
||||
<object id="1" x="11.9936" y="32.068">
|
||||
<polygon points="0,0 20.0744,0 19.7342,-23.4769 17.8628,-25.3482 7.6555,-23.1366 3.65763,-18.2031 0.255183,-14.3753 -1.95641,-11.4833"/>
|
||||
</object>
|
||||
</objectgroup>
|
||||
</tile>
|
||||
<tile id="2659">
|
||||
<objectgroup draworder="index" id="2">
|
||||
<object id="1" x="11.9086" y="-0.0850611">
|
||||
<polygon points="0,0 18.118,0.0850611 19.9043,6.03934 19.9894,16.4168 19.9043,28.2403 16.8421,32.068 -12.0787,31.8979 -12.0787,6.71983"/>
|
||||
</object>
|
||||
</objectgroup>
|
||||
</tile>
|
||||
<tile id="2660">
|
||||
<objectgroup draworder="index" id="2">
|
||||
<object id="1" x="18.2031" y="0.255183">
|
||||
<polygon points="0,0 -18.2031,-0.0850611 -18.4583,12.7592 -15.311,15.5662 -10.7177,17.9479 -6.03934,16.5869 6.97501,6.54971 6.63477,4.50824"/>
|
||||
</object>
|
||||
</objectgroup>
|
||||
</tile>
|
||||
<tile id="2661">
|
||||
<objectgroup draworder="index" id="2">
|
||||
<object id="1" x="15.7363" y="0">
|
||||
<polygon points="0,0 15.9915,-0.0850611 16.1616,11.9936 8.16587,17.7778 3.31738,18.9686 -7.06007,9.69697 -1.78628,0.680489"/>
|
||||
</object>
|
||||
</objectgroup>
|
||||
</tile>
|
||||
<tile id="2662">
|
||||
<objectgroup draworder="index" id="2">
|
||||
<object id="1" x="-0.170122" y="12.9293">
|
||||
<polygon points="0,0 0.0850611,-13.2695 18.118,-12.9293 25.2632,-7.74056 25.2632,-6.1244 12.1637,3.82775 7.31526,5.18873 3.0622,2.97714"/>
|
||||
</object>
|
||||
</objectgroup>
|
||||
</tile>
|
||||
<tile id="2663">
|
||||
<objectgroup draworder="index" id="2">
|
||||
<object id="1" x="15.6512" y="0.0850611">
|
||||
<polygon points="0,0 16.2467,-0.0850611 16.4168,11.8235 8.08081,18.033 3.31738,18.7985 -7.06007,9.52685"/>
|
||||
</object>
|
||||
</objectgroup>
|
||||
</tile>
|
||||
<tile id="2664">
|
||||
<objectgroup draworder="index" id="2">
|
||||
<object id="1" x="-0.255183" y="11.3131">
|
||||
<polygon points="0,0 0,-11.4833 31.983,-11.0579 32.1531,16.672 30.3668,20.4997 12.1637,20.5848 7.06007,19.5641 6.1244,18.4583 7.14514,6.63477"/>
|
||||
</object>
|
||||
</objectgroup>
|
||||
</tile>
|
||||
<tile id="2665">
|
||||
<objectgroup draworder="index" id="2">
|
||||
<object id="1" x="-0.170122" y="11.3131">
|
||||
<polygon points="0,0 -0.0850611,-11.5683 32.1531,-11.0579 31.983,16.8421 29.9415,20.4997 17.9479,20.7549 8.08081,16.672 3.99787,13.3546"/>
|
||||
</object>
|
||||
</objectgroup>
|
||||
</tile>
|
||||
<tile id="2666">
|
||||
<objectgroup draworder="index" id="2">
|
||||
<object id="1" x="-0.0850611" y="11.3131">
|
||||
<polygon points="0,0 0.0850611,-11.4833 31.8979,-11.143 31.983,20.6699 17.7778,20.5848 7.74056,16.5019 3.82775,13.2695"/>
|
||||
</object>
|
||||
</objectgroup>
|
||||
</tile>
|
||||
<tile id="2667">
|
||||
<objectgroup draworder="index" id="2">
|
||||
<object id="1" x="21.0952" y="0.170122">
|
||||
<polygon points="0,0 -21.0952,0 -21.0101,25.7735 -20.0744,31.4726 10.9729,31.5577 10.8878,7.82562"/>
|
||||
</object>
|
||||
</objectgroup>
|
||||
</tile>
|
||||
<tile id="2668">
|
||||
<objectgroup draworder="index" id="2">
|
||||
<object id="1" x="11.7384" y="0.255183">
|
||||
<polygon points="0,0 20.2446,-0.255183 20.2446,27.815 17.3525,31.3876 -11.9086,31.5577 -11.8235,6.37959"/>
|
||||
</object>
|
||||
</objectgroup>
|
||||
</tile>
|
||||
<tile id="2669">
|
||||
<objectgroup draworder="index" id="2">
|
||||
<object id="1" x="-0.170122" y="12.9293">
|
||||
<polygon points="0,0 0.255183,-12.9293 18.3732,-13.0994 25.2632,-8.08081 25.1781,-5.78416 12.1637,3.91281 7.40032,5.18873 3.0622,2.89208"/>
|
||||
</object>
|
||||
</objectgroup>
|
||||
</tile>
|
||||
<tile id="2670">
|
||||
<objectgroup draworder="index" id="2">
|
||||
<object id="1" x="15.7363" y="0.0850611">
|
||||
<polygon points="0,0 16.0766,0 16.1616,12.1637 8.08081,17.8628 3.48751,19.0537 -7.2302,9.61191"/>
|
||||
</object>
|
||||
</objectgroup>
|
||||
</tile>
|
||||
<tile id="2695">
|
||||
<objectgroup draworder="index" id="2">
|
||||
<object id="1" x="19.2238" y="0.0850611">
|
||||
<polygon points="0,0 -17.3525,-0.170122 -18.2881,1.02073 -18.2881,8.59117 -17.2674,13.4397 -17.1823,19.9043 -18.2881,25.8586 -18.2881,29.4312 -16.757,31.7278 -4.84848,32.068 5.10367,29.7714 7.91069,25.7735 8.7613,13.7799 5.35885,6.71983"/>
|
||||
</object>
|
||||
</objectgroup>
|
||||
</tile>
|
||||
<tile id="2699">
|
||||
<objectgroup draworder="index" id="2">
|
||||
<object id="1" x="10.8028" y="-0.0850611">
|
||||
<polygon points="0,0 17.8628,-0.0850611 19.9894,2.21159 20.925,25.5183 21.1802,29.261 18.2881,31.8129 -0.170122,32.068 -1.10579,28.5805 -3.14726,20.3296 -2.21159,17.0122"/>
|
||||
</object>
|
||||
</objectgroup>
|
||||
</tile>
|
||||
<tile id="2710">
|
||||
<objectgroup draworder="index" id="2">
|
||||
<object id="1" x="1.02073" y="0.170122">
|
||||
<polygon points="0,0 30.9623,-0.0850611 30.7921,31.8129 -0.0850611,31.7278"/>
|
||||
</object>
|
||||
</objectgroup>
|
||||
</tile>
|
||||
<tile id="2711">
|
||||
<objectgroup draworder="index" id="2">
|
||||
<object id="1" x="21.0101" y="-0.0850611">
|
||||
<polygon points="0,0 -21.0101,0.170122 -20.925,31.6427 10.9729,31.8979 10.7177,5.61404 6.71983,5.01861 2.89208,2.97714"/>
|
||||
</object>
|
||||
</objectgroup>
|
||||
</tile>
|
||||
<tile id="2712">
|
||||
<objectgroup draworder="index" id="2">
|
||||
<object id="1" x="0.0850611" y="6.80489">
|
||||
<polygon points="0,0 -0.0850611,25.008 32.068,25.008 31.8129,0.850611 29.7714,-0.935673 15.6512,-4.08293 12.9293,-3.99787 5.95428,-2.97714"/>
|
||||
</object>
|
||||
</objectgroup>
|
||||
</tile>
|
||||
<tile id="2713">
|
||||
<objectgroup draworder="index" id="2">
|
||||
<object id="1" x="-0.0850611" y="6.20946">
|
||||
<polygon points="0,0 0.0850611,25.5183 32.3232,25.7735 31.983,-6.37959 11.8235,-6.1244"/>
|
||||
</object>
|
||||
</objectgroup>
|
||||
</tile>
|
||||
<tile id="2714">
|
||||
<objectgroup draworder="index" id="2">
|
||||
<object id="1" x="29.0058" y="0.0850611">
|
||||
<polygon points="0,0 -29.176,0 -29.0909,31.5577 0.255183,31.8979 1.27592,30.7071 1.95641,27.6449"/>
|
||||
</object>
|
||||
</objectgroup>
|
||||
</tile>
|
||||
<tile id="2715">
|
||||
<objectgroup draworder="index" id="2">
|
||||
<object id="1" x="0.170122" y="13.95">
|
||||
<polygon points="0,0 0,-14.1201 31.6427,-13.7799 31.7278,0.340245 27.5598,5.78416 22.5412,8.08081 12.8442,9.95215 9.86709,10.0372 6.71983,9.01648"/>
|
||||
</object>
|
||||
</objectgroup>
|
||||
</tile>
|
||||
<tile id="2716">
|
||||
<objectgroup draworder="index" id="2">
|
||||
<object id="1" x="-0.0850611" y="14.0351">
|
||||
<polygon points="0,0 -0.0850611,-14.3753 31.8979,-14.2052 31.983,0.0850611 27.9851,5.78416 22.9665,7.91069 13.0994,9.78203 9.95215,9.86709 6.71983,8.7613"/>
|
||||
</object>
|
||||
</objectgroup>
|
||||
</tile>
|
||||
<tile id="2717">
|
||||
<objectgroup draworder="index" id="2">
|
||||
<object id="1" x="0" y="14.2052">
|
||||
<polygon points="0,0 0.0850611,-12.4189 1.02073,-14.3753 31.8979,-14.1201 31.8979,-0.255183 27.9001,5.52897 22.7113,7.6555 12.8442,9.86709 9.78203,9.69697 6.63477,8.7613"/>
|
||||
</object>
|
||||
</objectgroup>
|
||||
</tile>
|
||||
<tile id="2718">
|
||||
<objectgroup draworder="index" id="2">
|
||||
<object id="1" x="-0.255183" y="14.2052">
|
||||
<polygon points="0,0 0.170122,-14.2903 29.0058,-14.2052 32.3232,-12.0787 32.2382,-0.255183 27.9851,5.86922 22.9665,7.74056 13.1845,9.61191 10.0372,9.95215 6.88995,8.59117"/>
|
||||
</object>
|
||||
</objectgroup>
|
||||
</tile>
|
||||
<tile id="2719">
|
||||
<objectgroup draworder="index" id="2">
|
||||
<object id="1" x="-0.0850611" y="28.4104">
|
||||
<polygon points="0,0 0.170122,-28.7507 31.983,-28.4104 32.068,-12.504 27.1345,-0.76555 17.8628,3.48751 3.74269,3.57257"/>
|
||||
</object>
|
||||
</objectgroup>
|
||||
</tile>
|
||||
<tile id="2720">
|
||||
<objectgroup draworder="index" id="2">
|
||||
<object id="1" x="-0.170122" y="28.0702">
|
||||
<polygon points="0,0 0.0850611,-28.2403 32.1531,-27.9001 32.068,-11.8235 30.1967,-7.31526 24.1574,1.70122 17.0122,3.91281 3.0622,3.65763"/>
|
||||
</object>
|
||||
</objectgroup>
|
||||
</tile>
|
||||
<tile id="2721">
|
||||
<objectgroup draworder="index" id="2">
|
||||
<object id="1" x="28.9208" y="0">
|
||||
<polygon points="0,0 -29.176,0.170122 -29.0058,26.1138 -27.2196,29.6013 -25.1781,31.8129 -10.9729,31.8979 -1.70122,27.9001 -0.850611,25.7735 2.97714,16.0766 3.0622,2.6369"/>
|
||||
</object>
|
||||
</objectgroup>
|
||||
</tile>
|
||||
<tile id="2722">
|
||||
<objectgroup draworder="index" id="2">
|
||||
<object id="1" x="0.0850611" y="13.0994">
|
||||
<polygon points="0,0 0,-13.3546 17.9479,-13.2695 24.8379,-8.16587 24.9229,-6.29452 11.4833,3.99787 6.71983,4.84848 2.55183,2.72196"/>
|
||||
</object>
|
||||
</objectgroup>
|
||||
</tile>
|
||||
<tile id="2723">
|
||||
<objectgroup draworder="index" id="2">
|
||||
<object id="1" x="15.5662" y="0.0850611">
|
||||
<polygon points="0,0 16.5869,0.0850611 16.4168,12.0787 8.16587,18.118 3.31738,18.9686 -7.06007,9.69697 -1.61616,0.680489"/>
|
||||
</object>
|
||||
</objectgroup>
|
||||
</tile>
|
||||
<tile id="2724">
|
||||
<objectgroup draworder="index" id="2">
|
||||
<object id="1" x="19.2238" y="0.0850611">
|
||||
<polygon points="0,0 -19.2238,0 -19.3089,27.9001 -17.4375,31.7278 -5.27379,31.8129 0.680489,30.622 4.93355,29.7714 7.82562,25.6885 8.7613,13.865 5.44391,6.54971"/>
|
||||
</object>
|
||||
</objectgroup>
|
||||
</tile>
|
||||
<tile id="2725">
|
||||
<objectgroup draworder="index" id="2">
|
||||
<object id="1" x="10.8878" y="0">
|
||||
<polygon points="0,0 21.0952,-0.0850611 21.0952,32.068 -0.170122,32.068 -2.21159,24.1574 -3.31738,19.3089 -2.04147,16.757 1.87135,12.8442 0.170122,1.95641"/>
|
||||
</object>
|
||||
</objectgroup>
|
||||
</tile>
|
||||
<tile id="2750">
|
||||
<objectgroup draworder="index" id="2">
|
||||
<object id="1" x="21.0952" y="-0.170122">
|
||||
<polygon points="0,0 -19.3089,-0.0850611 -20.2446,3.23232 -20.3296,8.08081 -17.1823,11.9936 -17.1823,17.0973 -11.9936,23.9022 -10.6326,27.1345 -2.21159,30.1967 6.88995,31.0473 10.8028,31.1324 10.8028,7.40032 9.69697,6.80489 2.6369,5.10367"/>
|
||||
</object>
|
||||
</objectgroup>
|
||||
</tile>
|
||||
<tile id="2751">
|
||||
<objectgroup draworder="index" id="2">
|
||||
<object id="1" x="0.170122" y="5.10367">
|
||||
<polygon points="0,0 -0.0850611,26.8793 18.7985,26.8793 21.6055,25.7735 26.0287,19.6491 22.8814,6.71983 15.5662,5.6991 13.6098,-0.425306"/>
|
||||
</object>
|
||||
</objectgroup>
|
||||
</tile>
|
||||
<tile id="2753">
|
||||
<objectgroup draworder="index" id="2">
|
||||
<object id="1" x="12.4189" y="31.8129">
|
||||
<polygon points="0,0 17.8628,-0.0850611 19.7342,-2.04147 19.5641,-23.0516 17.6077,-24.8379 14.3753,-24.9229 10.6326,-23.7321 7.40032,-22.8814 6.1244,-21.9458 3.31738,-17.7778 -0.510367,-13.865 -2.89208,-10.7177 -2.6369,-9.1866 2.55183,-4.93355 -0.680489,-1.36098"/>
|
||||
</object>
|
||||
</objectgroup>
|
||||
</tile>
|
||||
<tile id="2754">
|
||||
<objectgroup draworder="index" id="2">
|
||||
<object id="1" x="11.5683" y="0">
|
||||
<polygon points="0,0 18.3732,-0.0850611 20.4147,6.03934 20.4147,10.6326 16.4168,17.8628 13.3546,21.0952 7.99575,28.0702 3.31738,27.9851 0.340245,29.176 -5.6991,29.0058 -7.57044,30.9623 -11.7384,30.9623 -11.4833,6.80489 -9.35673,6.1244 -3.40245,3.0622"/>
|
||||
</object>
|
||||
</objectgroup>
|
||||
</tile>
|
||||
<tile id="2765">
|
||||
<objectgroup draworder="index" id="2">
|
||||
<object id="1" x="0.935673" y="0.340245">
|
||||
<polygon points="0,0 30.9623,-0.255183 30.8772,26.7092 28.8357,29.7714 22.0308,30.7071 17.7778,30.5369 9.69697,25.6034 -0.935673,16.9272 -1.10579,11.3982"/>
|
||||
</object>
|
||||
</objectgroup>
|
||||
</tile>
|
||||
<tile id="2766">
|
||||
<objectgroup draworder="index" id="2">
|
||||
<object id="1" x="0" y="0" width="32" height="32"/>
|
||||
</objectgroup>
|
||||
</tile>
|
||||
<tile id="2767">
|
||||
<objectgroup draworder="index" id="2">
|
||||
<object id="1" x="0" y="0" width="32" height="32"/>
|
||||
</objectgroup>
|
||||
</tile>
|
||||
<tile id="2768">
|
||||
<objectgroup draworder="index" id="2">
|
||||
<object id="1" x="0" y="0" width="32" height="32"/>
|
||||
</objectgroup>
|
||||
</tile>
|
||||
<tile id="2769">
|
||||
<objectgroup draworder="index" id="2">
|
||||
<object id="1" x="0" y="26.0287">
|
||||
<polygon points="0,0 -0.255183,-26.0287 28.8357,-26.0287 29.9415,-25.093 30.9623,-11.143 28.7507,-7.99575 23.9022,-2.89208 16.8421,3.23232 13.0144,4.25306 1.95641,4.08293"/>
|
||||
</object>
|
||||
</objectgroup>
|
||||
</tile>
|
||||
<tile id="2770">
|
||||
<objectgroup draworder="index" id="2">
|
||||
<object id="1" x="-0.0850611" y="14.1201">
|
||||
<polygon points="0,0 -0.0850611,-12.4189 1.19086,-14.0351 32.2382,-14.0351 31.8979,0.0850611 27.9001,5.61404 22.7113,7.91069 12.7592,10.0372 9.86709,10.1223 6.71983,8.59117"/>
|
||||
</object>
|
||||
</objectgroup>
|
||||
</tile>
|
||||
<tile id="2771">
|
||||
<objectgroup draworder="index" id="2">
|
||||
<object id="1" x="-0.0850611" y="14.3753">
|
||||
<polygon points="0,0 -0.0850611,-14.7156 29.3461,-14.2903 32.068,-12.504 31.983,-0.170122 27.815,5.44391 22.8814,7.48538 13.0144,9.78203 10.1223,9.69697 6.88995,8.59117"/>
|
||||
</object>
|
||||
</objectgroup>
|
||||
</tile>
|
||||
<tile id="2772">
|
||||
<objectgroup draworder="index" id="2">
|
||||
<object id="1" x="0" y="14.2903">
|
||||
<polygon points="0,0 0,-14.4604 31.8979,-14.1201 31.8979,-0.0850611 27.9001,5.44391 22.7964,7.6555 13.0144,9.95215 9.95215,9.86709 6.97501,8.59117"/>
|
||||
</object>
|
||||
</objectgroup>
|
||||
</tile>
|
||||
<tile id="2773">
|
||||
<objectgroup draworder="index" id="2">
|
||||
<object id="1" x="0.0850611" y="14.3753">
|
||||
<polygon points="0,0 -0.255183,-14.6305 31.7278,-14.3753 31.7278,-0.510367 27.7299,5.52897 22.3711,7.74056 12.4189,9.61191 9.86709,9.44179 6.54971,8.50611"/>
|
||||
</object>
|
||||
</objectgroup>
|
||||
</tile>
|
||||
<tile id="2774">
|
||||
<objectgroup draworder="index" id="2">
|
||||
<object id="1" x="11.8235" y="-0.0850611">
|
||||
<polygon points="0,0 20.1595,0.0850611 19.9894,28.1552 17.0973,31.983 -11.7384,31.983 -11.7384,6.88995"/>
|
||||
</object>
|
||||
</objectgroup>
|
||||
</tile>
|
||||
<tile id="2775">
|
||||
<objectgroup draworder="index" id="2">
|
||||
<object id="1" x="21.2653" y="0.170122">
|
||||
<polygon points="0,0 -21.2653,0 -21.3503,25.8586 -20.2446,31.5577 10.8028,31.6427 10.6326,7.74056"/>
|
||||
</object>
|
||||
</objectgroup>
|
||||
</tile>
|
||||
<tile id="2776">
|
||||
<objectgroup draworder="index" id="2">
|
||||
<object id="1" x="-0.170122" y="26.1988">
|
||||
<polygon points="0,0 0.255183,-26.6241 29.261,-26.369 31.983,-23.1366 32.1531,-10.5476 30.1116,-5.35885 23.9022,3.57257 17.0973,5.6991 2.72196,5.44391"/>
|
||||
</object>
|
||||
</objectgroup>
|
||||
</tile>
|
||||
<tile id="2777">
|
||||
<objectgroup draworder="index" id="2">
|
||||
<object id="1" x="19.0537" y="0">
|
||||
<polygon points="0,0 -19.2238,-0.0850611 -19.0537,25.7735 -17.3525,31.7278 -4.84848,31.983 4.93355,29.9415 7.91069,26.1988 9.10154,13.6948 5.61404,6.54971"/>
|
||||
</object>
|
||||
</objectgroup>
|
||||
</tile>
|
||||
<tile id="2778">
|
||||
<objectgroup draworder="index" id="2">
|
||||
<object id="1" x="11.0579" y="0">
|
||||
<polygon points="0,0 20.84,0.170122 21.0101,31.7278 -0.0850611,31.7278 -1.36098,28.6656 -2.38171,24.1574 -3.31738,20.4997 -2.04147,16.8421"/>
|
||||
</object>
|
||||
</objectgroup>
|
||||
</tile>
|
||||
<tile id="2781">
|
||||
<objectgroup draworder="index" id="2">
|
||||
<object id="1" x="0.0850611" y="5.52897">
|
||||
|
|
@ -3234,6 +3781,111 @@
|
|||
</object>
|
||||
</objectgroup>
|
||||
</tile>
|
||||
<tile id="2806">
|
||||
<objectgroup draworder="index" id="2">
|
||||
<object id="1" x="20.925" y="0.170122">
|
||||
<polygon points="0,0 -18.033,-0.170122 -18.9686,1.95641 -18.2881,15.4811 -16.0766,17.6927 -9.10154,24.7528 -2.04147,28.4955 5.86922,29.7714 11.0579,29.6863 10.9729,14.7156 10.8878,5.61404 6.97501,4.93355 2.80702,2.6369"/>
|
||||
</object>
|
||||
</objectgroup>
|
||||
</tile>
|
||||
<tile id="2807">
|
||||
<objectgroup draworder="index" id="2">
|
||||
<object id="1" x="0.0850611" y="6.80489">
|
||||
<polygon points="0,0 -0.170122,23.9872 10.9729,25.008 15.8214,25.093 25.008,24.0723 31.7278,23.9872 31.8129,1.02073 29.6013,-0.935673 24.5827,-0.935673 20.7549,-1.95641 15.3961,-3.91281 12.589,-3.82775 5.78416,-2.89208"/>
|
||||
</object>
|
||||
</objectgroup>
|
||||
</tile>
|
||||
<tile id="2808">
|
||||
<objectgroup draworder="index" id="2">
|
||||
<object id="1" x="0" y="6.1244">
|
||||
<polygon points="0,0 -0.170122,24.9229 4.08293,24.9229 15.5662,19.8192 24.1574,14.8857 29.3461,10.8028 30.9623,2.80702 30.9623,-4.42318 28.7507,-6.37959 12.1637,-6.20946 9.95215,-3.14726"/>
|
||||
</object>
|
||||
</objectgroup>
|
||||
</tile>
|
||||
<tile id="2821">
|
||||
<objectgroup draworder="index" id="2">
|
||||
<object id="1" x="2.04147" y="0.0850611">
|
||||
<polygon points="0,0 29.9415,0 29.7714,25.8586 25.6885,29.176 15.8214,29.9415 7.6555,26.7092 -0.340245,17.5226 -1.36098,9.69697 -1.19086,2.97714"/>
|
||||
</object>
|
||||
</objectgroup>
|
||||
</tile>
|
||||
<tile id="2822">
|
||||
<objectgroup draworder="index" id="2">
|
||||
<object id="1" x="0.0850611" y="25.9436">
|
||||
<polygon points="0,0 -0.0850611,-26.369 31.8979,-26.1988 31.8129,0.76555 22.5412,-1.19086 13.6098,-1.10579 4.67836,0.935673 2.72196,-2.04147 1.70122,-1.95641"/>
|
||||
</object>
|
||||
</objectgroup>
|
||||
</tile>
|
||||
<tile id="2823">
|
||||
<objectgroup draworder="index" id="2">
|
||||
<object id="1" x="0.0850611" y="28.0702">
|
||||
<polygon points="0,0 0,-28.4104 29.6863,-28.1552 31.8979,-21.2653 31.8129,-14.1201 25.6885,-16.2467 22.7113,-16.0766 15.8214,-10.9729 12.9293,-5.18873 2.89208,-5.27379 0.935673,-3.0622"/>
|
||||
</object>
|
||||
</objectgroup>
|
||||
</tile>
|
||||
<tile id="2825">
|
||||
<objectgroup draworder="index" id="2">
|
||||
<object id="1" x="-0.0850611" y="11.143">
|
||||
<polygon points="0,0 0.0850611,-11.4833 28.9208,-11.0579 29.7714,-10.3775 30.7921,0.680489 30.8772,3.82775 27.9001,12.589 29.8565,17.6927 30.0266,20.7549 11.8235,20.84 6.80489,19.9894 5.86922,18.6284 7.06007,6.63477"/>
|
||||
</object>
|
||||
</objectgroup>
|
||||
</tile>
|
||||
<tile id="2826">
|
||||
<objectgroup draworder="index" id="2">
|
||||
<object id="1" x="-0.0850611" y="11.143">
|
||||
<polygon points="0,0 0.170122,-11.3982 29.0058,-11.143 29.9415,-9.95215 30.8772,1.44604 30.0266,20.7549 17.7778,20.7549 14.9708,19.6491 7.82562,16.672 3.82775,13.6948 3.99787,10.9729 3.91281,2.80702 2.12653,1.87135"/>
|
||||
</object>
|
||||
</objectgroup>
|
||||
</tile>
|
||||
<tile id="2827">
|
||||
<objectgroup draworder="index" id="2">
|
||||
<object id="1" x="0.850611" y="2.89208">
|
||||
<polygon points="0,0 -0.170122,-2.97714 31.1324,-3.0622 31.0473,13.1845 26.8793,22.8814 26.0287,25.093 17.0973,29.0909 2.55183,29.176 1.87135,27.7299 -1.02073,13.6098 -1.10579,8.67624"/>
|
||||
</object>
|
||||
</objectgroup>
|
||||
</tile>
|
||||
<tile id="2828">
|
||||
<objectgroup draworder="index" id="2">
|
||||
<object id="1" x="1.02073" y="2.97714">
|
||||
<polygon points="0,0 -0.0850611,-2.89208 31.0473,-2.89208 31.0473,13.0144 29.0058,17.6927 22.9665,26.7092 16.0766,29.0909 1.78628,29.0058 0.680489,27.7299 -1.36098,13.7799 -1.10579,8.59117"/>
|
||||
</object>
|
||||
</objectgroup>
|
||||
</tile>
|
||||
<tile id="2829">
|
||||
<objectgroup draworder="index" id="2">
|
||||
<object id="1" x="0.255183" y="11.0579">
|
||||
<polygon points="0,0 -0.340245,-11.2281 31.6427,-11.0579 31.6427,20.7549 11.5683,21.0952 6.37959,20.1595 5.52897,18.9686 6.88995,6.63477 1.36098,1.5311"/>
|
||||
</object>
|
||||
</objectgroup>
|
||||
</tile>
|
||||
<tile id="2830">
|
||||
<objectgroup draworder="index" id="2">
|
||||
<object id="1" x="-0.425306" y="11.3131">
|
||||
<polygon points="0,0 0.255183,-11.4833 32.3232,-11.2281 32.3232,20.4997 18.2881,20.5848 8.08081,16.5869 5.35885,14.8006 3.99787,13.2695"/>
|
||||
</object>
|
||||
</objectgroup>
|
||||
</tile>
|
||||
<tile id="2831">
|
||||
<objectgroup draworder="index" id="2">
|
||||
<object id="1" x="0.0850611" y="2.89208">
|
||||
<polygon points="0,0 0.935673,-3.0622 31.8129,-2.80702 31.8129,24.4125 30.0266,28.8357 11.5683,29.0058 6.80489,27.9851 5.52897,26.9644 6.71983,15.311 1.61616,9.61191 -0.255183,7.74056"/>
|
||||
</object>
|
||||
</objectgroup>
|
||||
</tile>
|
||||
<tile id="2832">
|
||||
<objectgroup draworder="index" id="2">
|
||||
<object id="1" x="18.118" y="31.983">
|
||||
<polygon points="0,0 -18.118,-0.170122 -18.2031,-32.068 10.9729,-31.983 13.6948,-28.9208 13.865,-16.1616 9.78203,-6.29452 8.84636,-4.08293"/>
|
||||
</object>
|
||||
</objectgroup>
|
||||
</tile>
|
||||
<tile id="2833">
|
||||
<objectgroup draworder="index" id="2">
|
||||
<object id="1" x="29.0058" y="0.170122">
|
||||
<polygon points="0,0 -29.176,0.0850611 -29.0058,31.6427 -11.8235,31.8129 -4.93355,29.7714 1.19086,20.4147 3.23232,15.9064 3.0622,2.72196"/>
|
||||
</object>
|
||||
</objectgroup>
|
||||
</tile>
|
||||
<tile id="2836">
|
||||
<objectgroup draworder="index" id="2">
|
||||
<object id="1" x="20.84" y="0.255183">
|
||||
|
|
@ -3248,6 +3900,132 @@
|
|||
</object>
|
||||
</objectgroup>
|
||||
</tile>
|
||||
<tile id="2860">
|
||||
<objectgroup draworder="index" id="2">
|
||||
<object id="1" x="20.0744" y="0">
|
||||
<polygon points="0,0 -17.5226,0.0850611 -19.2238,2.12653 -20.2446,10.0372 -20.1595,21.8607 -19.2238,29.4312 -17.3525,31.8979 -5.01861,31.7278 7.2302,27.9001 10.1223,22.5412 7.99575,16.672 9.10154,10.8878 8.84636,7.74056"/>
|
||||
</object>
|
||||
</objectgroup>
|
||||
</tile>
|
||||
<tile id="2861">
|
||||
<objectgroup draworder="index" id="2">
|
||||
<object id="1" x="13.95" y="0.255183">
|
||||
<polygon points="0,0 15.0558,-0.425306 16.8421,1.70122 17.9479,9.35673 17.8628,22.0308 16.9272,29.6863 15.1409,31.7278 -2.38171,31.5577 -7.31526,26.454 -11.3982,20.4147 -11.2281,15.4811 -3.31738,4.42318"/>
|
||||
</object>
|
||||
</objectgroup>
|
||||
</tile>
|
||||
<tile id="2862">
|
||||
<objectgroup draworder="index" id="2">
|
||||
<object id="1" x="-0.170122" y="14.1201">
|
||||
<polygon points="0,0 -0.0850611,-12.4189 7.6555,-12.3339 14.0351,-13.1845 22.5412,-13.1845 32.068,-12.3339 32.2382,-1.10579 23.4769,4.168 17.0122,-1.36098 4.93355,2.80702 3.0622,2.80702"/>
|
||||
</object>
|
||||
</objectgroup>
|
||||
</tile>
|
||||
<tile id="2863">
|
||||
<objectgroup draworder="index" id="2">
|
||||
<object id="1" x="0" y="15.2259">
|
||||
<polygon points="0,0 0.0850611,-14.5455 31.8979,-14.3753 31.983,-1.19086 28.6656,1.02073 24.0723,2.04147 20.2446,-1.95641 14.8857,-2.21159 12.0787,1.61616 9.86709,1.44604 4.93355,1.61616"/>
|
||||
</object>
|
||||
</objectgroup>
|
||||
</tile>
|
||||
<tile id="2866">
|
||||
<objectgroup draworder="index" id="2">
|
||||
<object id="1" x="21.0952" y="-0.255183">
|
||||
<polygon points="0,0 -19.2238,0 -20.1595,3.0622 -20.0744,4.76342 -14.3753,13.7799 -10.4625,19.0537 -7.31526,20.2446 -3.48751,21.3503 2.97714,21.3503 11.0579,17.2674 10.8028,8.33599 9.69697,6.97501"/>
|
||||
</object>
|
||||
</objectgroup>
|
||||
</tile>
|
||||
<tile id="2867">
|
||||
<objectgroup draworder="index" id="2">
|
||||
<object id="1" x="-0.170122" y="8.84636">
|
||||
<polygon points="0,0 0,7.99575 11.9086,8.16587 27.3897,5.01861 28.2403,2.72196 28.0702,-0.76555 25.7735,-2.12653 9.10154,-2.80702 5.95428,-2.72196 2.97714,-1.95641"/>
|
||||
</object>
|
||||
</objectgroup>
|
||||
</tile>
|
||||
<tile id="2868">
|
||||
<objectgroup draworder="index" id="2">
|
||||
<object id="1" x="32.068" y="7.99575">
|
||||
<polygon points="0,0 -0.0850611,9.78203 -5.44391,10.0372 -8.33599,9.10154 -14.2903,5.86922 -18.2031,3.91281 -21.2653,2.80702 -25.1781,2.21159 -25.2632,-1.10579 -11.5683,-3.40245 -2.29665,-2.29665"/>
|
||||
</object>
|
||||
</objectgroup>
|
||||
</tile>
|
||||
<tile id="2869">
|
||||
<objectgroup draworder="index" id="2">
|
||||
<object id="1" x="-0.0850611" y="6.88995">
|
||||
<polygon points="0,0 0,9.69697 9.78203,13.95 18.2881,14.0351 25.2632,11.9936 27.1345,9.95215 30.8772,2.12653 31.0473,-3.31738 30.0266,-6.71983 11.8235,-6.97501"/>
|
||||
</object>
|
||||
</objectgroup>
|
||||
</tile>
|
||||
<tile id="2871">
|
||||
<objectgroup draworder="index" id="2">
|
||||
<object id="1" x="12.7592" y="31.5577">
|
||||
<polygon points="0,0 1.95641,-2.89208 6.29452,-3.91281 7.91069,-3.99787 10.2073,-1.95641 10.1223,0.340245"/>
|
||||
</object>
|
||||
</objectgroup>
|
||||
</tile>
|
||||
<tile id="2873">
|
||||
<objectgroup draworder="index" id="2">
|
||||
<object id="1" x="10.0372" y="31.3876">
|
||||
<polygon points="0,0 1.02073,-4.84848 3.82775,-4.67836 9.10154,-1.70122 9.01648,0.340245"/>
|
||||
</object>
|
||||
</objectgroup>
|
||||
</tile>
|
||||
<tile id="2880">
|
||||
<objectgroup draworder="index" id="2">
|
||||
<object id="1" x="-0.0850611" y="10.9729">
|
||||
<polygon points="0,0 -0.0850611,-11.143 28.9208,-11.0579 31.1324,10.8878 31.0473,16.757 30.1116,20.925 11.5683,20.925 6.03934,19.1388"/>
|
||||
</object>
|
||||
</objectgroup>
|
||||
</tile>
|
||||
<tile id="2881">
|
||||
<objectgroup draworder="index" id="2">
|
||||
<object id="1" x="-0.0850611" y="11.3131">
|
||||
<polygon points="0,0 0,-11.3982 29.176,-11.143 31.2174,16.1616 30.0266,20.7549 17.8628,20.7549 7.82562,16.5869 3.82775,13.5247"/>
|
||||
</object>
|
||||
</objectgroup>
|
||||
</tile>
|
||||
<tile id="2882">
|
||||
<objectgroup draworder="index" id="2">
|
||||
<object id="1" x="0.850611" y="0.255183">
|
||||
<polygon points="0,0 31.1324,-0.255183 31.0473,15.7363 28.0702,18.7135 27.1345,25.2632 26.0287,27.7299 17.2674,31.6427 -0.340245,31.6427"/>
|
||||
</object>
|
||||
</objectgroup>
|
||||
</tile>
|
||||
<tile id="2883">
|
||||
<objectgroup draworder="index" id="2">
|
||||
<object id="1" x="0.935673" y="4.84848">
|
||||
<polygon points="0,0 0.170122,-5.01861 30.9623,-4.84848 30.9623,11.143 29.176,15.9915 23.0516,25.093 16.0766,27.0494 -0.170122,27.3046"/>
|
||||
</object>
|
||||
</objectgroup>
|
||||
</tile>
|
||||
<tile id="2884">
|
||||
<objectgroup draworder="index" id="2">
|
||||
<object id="1" x="32.068" y="15.9064">
|
||||
<polygon points="0,0 -0.340245,-16.2467 -32.2382,-15.7363 -32.1531,15.9915 -14.1201,16.1616 -4.93355,11.9936 -3.82775,9.86709"/>
|
||||
</object>
|
||||
</objectgroup>
|
||||
</tile>
|
||||
<tile id="2885">
|
||||
<objectgroup draworder="index" id="2">
|
||||
<object id="1" x="17.0973" y="32.068">
|
||||
<polygon points="0,0 -17.1823,-0.170122 -17.0122,-32.2382 14.8857,-32.1531 14.8006,-16.1616 12.7592,-11.143 6.80489,-2.38171"/>
|
||||
</object>
|
||||
</objectgroup>
|
||||
</tile>
|
||||
<tile id="2886">
|
||||
<objectgroup draworder="index" id="2">
|
||||
<object id="1" x="0.850611" y="0">
|
||||
<polygon points="0,0 31.0473,0 31.0473,26.7092 29.0909,31.8979 16.757,31.983 6.71983,27.4747 3.0622,25.093 -1.10579,11.0579 -1.02073,1.70122"/>
|
||||
</object>
|
||||
</objectgroup>
|
||||
</tile>
|
||||
<tile id="2888">
|
||||
<objectgroup draworder="index" id="2">
|
||||
<object id="1" x="0.680489" y="-0.0850611">
|
||||
<polygon points="0,0 31.3876,0.0850611 31.3025,31.983 17.0973,32.068 6.88995,27.9001 3.0622,25.093 3.23232,16.5019 -0.935673,10.7177 -0.850611,1.61616"/>
|
||||
</object>
|
||||
</objectgroup>
|
||||
</tile>
|
||||
<tile id="2891">
|
||||
<objectgroup draworder="index" id="2">
|
||||
<object id="1" x="20.925" y="0.0850611">
|
||||
|
|
@ -3262,6 +4040,104 @@
|
|||
</object>
|
||||
</objectgroup>
|
||||
</tile>
|
||||
<tile id="2915">
|
||||
<objectgroup draworder="index" id="2">
|
||||
<object id="1" x="18.9686" y="0">
|
||||
<polygon points="0,0 -13.3546,-0.0850611 -17.4375,2.97714 -17.2674,29.6863 -15.1409,31.8129 1.87135,31.8129 10.0372,23.5619 11.2281,20.4147 11.0579,12.7592 7.14514,5.78416"/>
|
||||
</object>
|
||||
</objectgroup>
|
||||
</tile>
|
||||
<tile id="2916">
|
||||
<objectgroup draworder="index" id="2">
|
||||
<object id="1" x="9.95215" y="0.170122">
|
||||
<polygon points="0,0 19.3089,-0.0850611 22.1159,7.06007 21.0101,27.5598 19.9043,31.7278 0.76555,31.7278 -2.12653,25.008 -3.14726,13.6948"/>
|
||||
</object>
|
||||
</objectgroup>
|
||||
</tile>
|
||||
<tile id="2917">
|
||||
<objectgroup draworder="index" id="2">
|
||||
<object id="1" x="-0.0850611" y="6.97501">
|
||||
<polygon points="0,0 0.0850611,24.2424 2.97714,23.9872 8.84636,18.7985 10.8878,20.84 19.7342,21.6906 24.7528,22.201 31.983,23.9872 32.068,0.595428 24.7528,-3.40245 21.0101,-4.25306 19.9043,-4.168 8.84636,-5.10367 7.6555,-5.01861"/>
|
||||
</object>
|
||||
</objectgroup>
|
||||
</tile>
|
||||
<tile id="2918">
|
||||
<objectgroup draworder="index" id="2">
|
||||
<object id="1" x="-0.0850611" y="7.99575">
|
||||
<polygon points="0,0 0,23.1366 2.89208,22.9665 13.0144,19.9043 24.1574,19.9894 29.176,22.7964 32.068,23.0516 31.983,0.595428 29.4312,-1.61616 25.3482,-2.21159 15.5662,-6.20946 13.0994,-6.1244 7.99575,-5.10367"/>
|
||||
</object>
|
||||
</objectgroup>
|
||||
</tile>
|
||||
<tile id="2926">
|
||||
<objectgroup draworder="index" id="2">
|
||||
<object id="1" x="12.8442" y="0.0850611">
|
||||
<polygon points="0,0 10.0372,0 10.0372,5.6991 -1.95641,22.1159 -8.84636,30.9623 -13.1845,30.8772 -13.1845,5.6991"/>
|
||||
</object>
|
||||
</objectgroup>
|
||||
</tile>
|
||||
<tile id="2928">
|
||||
<objectgroup draworder="index" id="2">
|
||||
<object id="1" x="21.0101" y="0.170122">
|
||||
<polygon points="0,0 -11.3131,-0.0850611 -11.4833,3.48751 -6.46465,14.3753 3.74269,26.369 6.71983,29.6013 10.9729,29.6863 10.8878,5.61404 6.63477,4.93355"/>
|
||||
</object>
|
||||
</objectgroup>
|
||||
</tile>
|
||||
<tile id="2970">
|
||||
<objectgroup draworder="index" id="2">
|
||||
<object id="1" x="1.61616" y="0">
|
||||
<polygon points="0,0 17.8628,0.0850611 21.2653,11.8235 19.3939,23.9022 13.0144,32.068 -0.255183,31.8979 -0.935673,16.757 -0.680489,0.850611"/>
|
||||
</object>
|
||||
</objectgroup>
|
||||
</tile>
|
||||
<tile id="2971">
|
||||
<objectgroup draworder="index" id="2">
|
||||
<object id="1" x="10.8878" y="0.255183">
|
||||
<polygon points="0,0 19.3939,-0.255183 19.9894,4.67836 19.9894,30.5369 19.0537,31.7278 0,31.8129 -6.37959,26.7092 -8.33599,24.2424 -7.06007,9.69697 -0.595428,4.33812"/>
|
||||
</object>
|
||||
</objectgroup>
|
||||
</tile>
|
||||
<tile id="2972">
|
||||
<objectgroup draworder="index" id="2">
|
||||
<object id="1" x="0" y="10.5476">
|
||||
<polygon points="0,0 -0.0850611,-8.67624 21.5205,-10.5476 25.093,-10.6326 31.8979,-8.50611 31.8979,0.0850611 22.1159,0.340245 23.0516,11.2281 19.5641,12.3339 10.8878,13.6948 10.7177,10.0372 3.91281,2.12653"/>
|
||||
</object>
|
||||
</objectgroup>
|
||||
</tile>
|
||||
<tile id="2973">
|
||||
<objectgroup draworder="index" id="2">
|
||||
<object id="1" x="0" y="14.7156">
|
||||
<polygon points="0,0 -0.170122,-12.9293 10.2073,-12.6741 26.0287,-10.8878 30.3668,-12.9293 31.983,-12.6741 32.068,-2.12653 21.9458,4.93355 16.9272,6.03934 13.95,6.1244 4.76342,2.04147"/>
|
||||
</object>
|
||||
</objectgroup>
|
||||
</tile>
|
||||
<tile id="2976">
|
||||
<objectgroup draworder="index" id="2">
|
||||
<object id="1" x="2.04147" y="31.983">
|
||||
<polygon points="0,0 -0.0850611,-3.99787 1.87135,-12.0787 9.44179,-19.1388 12.6741,-21.4354 18.7985,-26.1138 24.9229,-29.4312 27.9001,-29.4312 29.7714,-27.9001 29.8565,-16.2467 27.815,-10.8028 21.5205,-2.29665 14.9708,-0.0850611"/>
|
||||
</object>
|
||||
</objectgroup>
|
||||
</tile>
|
||||
<tile id="2977">
|
||||
<objectgroup draworder="index" id="2">
|
||||
<object id="1" x="-0.170122" y="13.865">
|
||||
<polygon points="0,0 -0.0850611,-10.8028 4.168,-10.0372 8.08081,-7.99575 16.1616,-7.06007 20.4147,-4.84848 21.2653,-2.38171 19.2238,0.935673 13.1845,10.1223 9.95215,10.2073 6.88995,9.01648"/>
|
||||
</object>
|
||||
</objectgroup>
|
||||
</tile>
|
||||
<tile id="2978">
|
||||
<objectgroup draworder="index" id="2">
|
||||
<object id="1" x="32.068" y="2.12653">
|
||||
<polygon points="0,0 -0.170122,11.6534 -4.168,17.6077 -9.61191,19.9894 -12.3339,19.9043 -17.4375,15.6512 -20.4147,11.8235 -21.4354,9.10154 -19.0537,5.6991 -15.6512,4.33812 -8.08081,3.91281 -1.36098,-0.170122"/>
|
||||
</object>
|
||||
</objectgroup>
|
||||
</tile>
|
||||
<tile id="2979">
|
||||
<objectgroup draworder="index" id="2">
|
||||
<object id="1" x="0.170122" y="1.87135">
|
||||
<polygon points="0,0 4.08293,0.0850611 11.8235,1.87135 14.4604,3.57257 19.8192,9.95215 25.8586,16.1616 27.815,17.9479 29.6863,25.008 29.9415,28.7507 28.8357,30.1116 17.3525,30.1116 7.48538,26.0287 3.65763,22.7964 3.57257,12.2488 1.70122,11.2281 -0.340245,8.7613"/>
|
||||
</object>
|
||||
</objectgroup>
|
||||
</tile>
|
||||
<tile id="2985">
|
||||
<objectgroup draworder="index" id="2">
|
||||
<object id="1" x="-0.0850611" y="7.31526">
|
||||
|
|
@ -3360,6 +4236,20 @@
|
|||
</object>
|
||||
</objectgroup>
|
||||
</tile>
|
||||
<tile id="3027">
|
||||
<objectgroup draworder="index" id="2">
|
||||
<object id="1" x="-0.0850611" y="9.01648">
|
||||
<polygon points="0,0 0,21.8607 19.2238,22.9665 23.8171,22.9665 32.3232,21.8607 31.8979,-1.10579 29.8565,-2.38171 23.9872,-2.12653 5.6991,-3.0622 3.0622,-2.29665"/>
|
||||
</object>
|
||||
</objectgroup>
|
||||
</tile>
|
||||
<tile id="3028">
|
||||
<objectgroup draworder="index" id="2">
|
||||
<object id="1" x="0.0850611" y="6.88995">
|
||||
<polygon points="0,0 -0.0850611,24.2424 15.8214,25.3482 25.6885,23.7321 31.8979,24.0723 31.8979,0.850611 29.4312,-1.27592 4.67836,-2.04147"/>
|
||||
</object>
|
||||
</objectgroup>
|
||||
</tile>
|
||||
<tile id="3040">
|
||||
<objectgroup draworder="index" id="2">
|
||||
<object id="1" x="0" y="0" width="32" height="32"/>
|
||||
|
|
@ -3375,6 +4265,16 @@
|
|||
<object id="1" x="0" y="0" width="32" height="32"/>
|
||||
</objectgroup>
|
||||
</tile>
|
||||
<tile id="3043">
|
||||
<objectgroup draworder="index" id="2">
|
||||
<object id="1" x="0" y="0" width="32" height="32"/>
|
||||
</objectgroup>
|
||||
</tile>
|
||||
<tile id="3044">
|
||||
<objectgroup draworder="index" id="2">
|
||||
<object id="1" x="0" y="0" width="32" height="32"/>
|
||||
</objectgroup>
|
||||
</tile>
|
||||
<tile id="3045">
|
||||
<objectgroup draworder="index" id="2">
|
||||
<object id="1" x="0" y="0" width="32" height="32"/>
|
||||
|
|
@ -3529,6 +4429,13 @@
|
|||
</object>
|
||||
</objectgroup>
|
||||
</tile>
|
||||
<tile id="3113">
|
||||
<objectgroup draworder="index" id="2">
|
||||
<object id="1" x="1.27592" y="0.255183">
|
||||
<polygon points="0,0 20.7549,-0.255183 20.7549,1.70122 14.5455,8.67624 9.44179,9.95215 1.44604,6.63477 -0.425306,1.61616"/>
|
||||
</object>
|
||||
</objectgroup>
|
||||
</tile>
|
||||
<tile id="3150">
|
||||
<objectgroup draworder="index" id="2">
|
||||
<object id="1" x="3.99787" y="0.170122">
|
||||
|
|
|
|||
|
|
@ -2016,19 +2016,63 @@ PrefabInstance:
|
|||
- target: {fileID: -4658507409231842436, guid: 71d12b53bfe275a42b91a98a3e6e2f66, type: 3}
|
||||
propertyPath: _networkBehaviours.Array.data[0]
|
||||
value:
|
||||
objectReference: {fileID: 508924469}
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2401461192666499815, guid: 71d12b53bfe275a42b91a98a3e6e2f66, type: 3}
|
||||
propertyPath: _networkObjectCache
|
||||
value:
|
||||
objectReference: {fileID: 508924470}
|
||||
- target: {fileID: 2401461192666499815, guid: 71d12b53bfe275a42b91a98a3e6e2f66, type: 3}
|
||||
propertyPath: _componentIndexCache
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2467740212711513134, guid: 71d12b53bfe275a42b91a98a3e6e2f66, type: 3}
|
||||
propertyPath: m_Size.x
|
||||
value: 12.521683
|
||||
value: 0.89100313
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2467740212711513134, guid: 71d12b53bfe275a42b91a98a3e6e2f66, type: 3}
|
||||
propertyPath: m_Size.y
|
||||
value: 0.8030002
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2467740212711513134, guid: 71d12b53bfe275a42b91a98a3e6e2f66, type: 3}
|
||||
propertyPath: m_Offset.x
|
||||
value: 2.6581507
|
||||
value: 0.00040507317
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2467740212711513134, guid: 71d12b53bfe275a42b91a98a3e6e2f66, type: 3}
|
||||
propertyPath: m_Offset.y
|
||||
value: -0.007763982
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2467740212711513134, guid: 71d12b53bfe275a42b91a98a3e6e2f66, type: 3}
|
||||
propertyPath: m_IsTrigger
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2467740212711513134, guid: 71d12b53bfe275a42b91a98a3e6e2f66, type: 3}
|
||||
propertyPath: m_SpriteTilingProperty.pivot.x
|
||||
value: 0.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2467740212711513134, guid: 71d12b53bfe275a42b91a98a3e6e2f66, type: 3}
|
||||
propertyPath: m_SpriteTilingProperty.pivot.y
|
||||
value: 0.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2467740212711513134, guid: 71d12b53bfe275a42b91a98a3e6e2f66, type: 3}
|
||||
propertyPath: m_SpriteTilingProperty.newSize.x
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2467740212711513134, guid: 71d12b53bfe275a42b91a98a3e6e2f66, type: 3}
|
||||
propertyPath: m_SpriteTilingProperty.newSize.y
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2467740212711513134, guid: 71d12b53bfe275a42b91a98a3e6e2f66, type: 3}
|
||||
propertyPath: m_SpriteTilingProperty.oldSize.x
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2467740212711513134, guid: 71d12b53bfe275a42b91a98a3e6e2f66, type: 3}
|
||||
propertyPath: m_SpriteTilingProperty.oldSize.y
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2467740212711513134, guid: 71d12b53bfe275a42b91a98a3e6e2f66, type: 3}
|
||||
propertyPath: m_SpriteTilingProperty.adaptiveTilingThreshold
|
||||
value: 0.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3463712308332304479, guid: 71d12b53bfe275a42b91a98a3e6e2f66, type: 3}
|
||||
propertyPath: m_Name
|
||||
value: SceneChangeTrigger
|
||||
|
|
@ -2039,11 +2083,11 @@ PrefabInstance:
|
|||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4423685822788232243, guid: 71d12b53bfe275a42b91a98a3e6e2f66, type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: -0.54
|
||||
value: -1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4423685822788232243, guid: 71d12b53bfe275a42b91a98a3e6e2f66, type: 3}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: -1.54
|
||||
value: -2
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4423685822788232243, guid: 71d12b53bfe275a42b91a98a3e6e2f66, type: 3}
|
||||
propertyPath: m_LocalPosition.z
|
||||
|
|
@ -2077,24 +2121,46 @@ PrefabInstance:
|
|||
propertyPath: m_LocalEulerAnglesHint.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5186788049215247401, guid: 71d12b53bfe275a42b91a98a3e6e2f66, type: 3}
|
||||
propertyPath: _isSpawnable
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5186788049215247401, guid: 71d12b53bfe275a42b91a98a3e6e2f66, type: 3}
|
||||
propertyPath: <SceneId>k__BackingField
|
||||
value: 2146407159
|
||||
value: 4007611127
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5186788049215247401, guid: 71d12b53bfe275a42b91a98a3e6e2f66, type: 3}
|
||||
propertyPath: _networkBehaviours.Array.size
|
||||
value: 2
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5186788049215247401, guid: 71d12b53bfe275a42b91a98a3e6e2f66, type: 3}
|
||||
propertyPath: _networkBehaviours.Array.data[0]
|
||||
value:
|
||||
objectReference: {fileID: 802857232}
|
||||
- target: {fileID: 5186788049215247401, guid: 71d12b53bfe275a42b91a98a3e6e2f66, type: 3}
|
||||
propertyPath: _networkBehaviours.Array.data[1]
|
||||
value:
|
||||
objectReference: {fileID: 802857225}
|
||||
- target: {fileID: 5186788049215247401, guid: 71d12b53bfe275a42b91a98a3e6e2f66, type: 3}
|
||||
propertyPath: _networkBehaviours.Array.data[2]
|
||||
value:
|
||||
objectReference: {fileID: 802857225}
|
||||
- target: {fileID: 5551679991364744983, guid: 71d12b53bfe275a42b91a98a3e6e2f66, type: 3}
|
||||
propertyPath: _networkObjectCache
|
||||
value:
|
||||
objectReference: {fileID: 508924470}
|
||||
- target: {fileID: 9091365521926218355, guid: 71d12b53bfe275a42b91a98a3e6e2f66, type: 3}
|
||||
propertyPath: _networkObjectCache
|
||||
value:
|
||||
objectReference: {fileID: 508924470}
|
||||
- target: {fileID: 9091365521926218355, guid: 71d12b53bfe275a42b91a98a3e6e2f66, type: 3}
|
||||
propertyPath: _componentIndexCache
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents:
|
||||
- {fileID: 665168782243639684, guid: 71d12b53bfe275a42b91a98a3e6e2f66, type: 3}
|
||||
- {fileID: 9091365521926218355, guid: 71d12b53bfe275a42b91a98a3e6e2f66, type: 3}
|
||||
- {fileID: 5551679991364744983, guid: 71d12b53bfe275a42b91a98a3e6e2f66, type: 3}
|
||||
m_RemovedGameObjects: []
|
||||
m_AddedGameObjects: []
|
||||
m_AddedComponents:
|
||||
|
|
@ -2104,18 +2170,10 @@ PrefabInstance:
|
|||
- targetCorrespondingSourceObject: {fileID: 3463712308332304479, guid: 71d12b53bfe275a42b91a98a3e6e2f66, type: 3}
|
||||
insertIndex: -1
|
||||
addedObject: {fileID: 802857226}
|
||||
- targetCorrespondingSourceObject: {fileID: 3463712308332304479, guid: 71d12b53bfe275a42b91a98a3e6e2f66, type: 3}
|
||||
insertIndex: -1
|
||||
addedObject: {fileID: 802857229}
|
||||
m_SourcePrefab: {fileID: 100100000, guid: 71d12b53bfe275a42b91a98a3e6e2f66, type: 3}
|
||||
--- !u!114 &508924469 stripped
|
||||
MonoBehaviour:
|
||||
m_CorrespondingSourceObject: {fileID: 5551679991364744983, guid: 71d12b53bfe275a42b91a98a3e6e2f66, type: 3}
|
||||
m_PrefabInstance: {fileID: 508924468}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 802857222}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: be3cb2952c351714c963b0766f53cef3, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
--- !u!114 &508924470 stripped
|
||||
MonoBehaviour:
|
||||
m_CorrespondingSourceObject: {fileID: 5186788049215247401, guid: 71d12b53bfe275a42b91a98a3e6e2f66, type: 3}
|
||||
|
|
@ -3634,8 +3692,7 @@ MonoBehaviour:
|
|||
_addedNetworkObject: {fileID: 508924470}
|
||||
_networkObjectCache: {fileID: 508924470}
|
||||
sceneName: FarmMap
|
||||
SceneStack: 0
|
||||
spawnPosition: {x: 30, y: 30, z: 0}
|
||||
spawnPosition: {x: 30, y: -30, z: 0}
|
||||
--- !u!114 &802857226
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -3648,10 +3705,73 @@ MonoBehaviour:
|
|||
m_Script: {fileID: 11500000, guid: c71fd7f855ec523429999fc4e14a1928, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
_overrideType: 2
|
||||
_overrideType: 3
|
||||
_updateHostVisibility: 1
|
||||
_observerConditions:
|
||||
- {fileID: 11400000, guid: 2033f54fd2794464bae08fa5a55c8996, type: 2}
|
||||
--- !u!212 &802857229
|
||||
SpriteRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 802857222}
|
||||
m_Enabled: 1
|
||||
m_CastShadows: 0
|
||||
m_ReceiveShadows: 0
|
||||
m_DynamicOccludee: 1
|
||||
m_StaticShadowCaster: 0
|
||||
m_MotionVectors: 1
|
||||
m_LightProbeUsage: 1
|
||||
m_ReflectionProbeUsage: 1
|
||||
m_RayTracingMode: 0
|
||||
m_RayTraceProcedural: 0
|
||||
m_RenderingLayerMask: 1
|
||||
m_RendererPriority: 0
|
||||
m_Materials:
|
||||
- {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2}
|
||||
m_StaticBatchInfo:
|
||||
firstSubMesh: 0
|
||||
subMeshCount: 0
|
||||
m_StaticBatchRoot: {fileID: 0}
|
||||
m_ProbeAnchor: {fileID: 0}
|
||||
m_LightProbeVolumeOverride: {fileID: 0}
|
||||
m_ScaleInLightmap: 1
|
||||
m_ReceiveGI: 1
|
||||
m_PreserveUVs: 0
|
||||
m_IgnoreNormalsForChartDetection: 0
|
||||
m_ImportantGI: 0
|
||||
m_StitchLightmapSeams: 1
|
||||
m_SelectedEditorRenderState: 0
|
||||
m_MinimumChartSize: 4
|
||||
m_AutoUVMaxDistance: 0.5
|
||||
m_AutoUVMaxAngle: 89
|
||||
m_LightmapParameters: {fileID: 0}
|
||||
m_SortingLayerID: 0
|
||||
m_SortingLayer: 0
|
||||
m_SortingOrder: 0
|
||||
m_Sprite: {fileID: -1244154544, guid: ac70ce904d41b844db3b71749443b7dd, type: 3}
|
||||
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_FlipX: 0
|
||||
m_FlipY: 0
|
||||
m_DrawMode: 0
|
||||
m_Size: {x: 1, y: 1}
|
||||
m_AdaptiveModeThreshold: 0.5
|
||||
m_SpriteTileMode: 0
|
||||
m_WasSpriteAssigned: 1
|
||||
m_MaskInteraction: 0
|
||||
m_SpriteSortPoint: 0
|
||||
--- !u!114 &802857232 stripped
|
||||
MonoBehaviour:
|
||||
m_CorrespondingSourceObject: {fileID: 2401461192666499815, guid: 71d12b53bfe275a42b91a98a3e6e2f66, type: 3}
|
||||
m_PrefabInstance: {fileID: 508924468}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 802857222}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: a60424afcf0b5984dbe878a1f21c10b2, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
--- !u!1 &804445073
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -2016,19 +2016,63 @@ PrefabInstance:
|
|||
- target: {fileID: -4658507409231842436, guid: 71d12b53bfe275a42b91a98a3e6e2f66, type: 3}
|
||||
propertyPath: _networkBehaviours.Array.data[0]
|
||||
value:
|
||||
objectReference: {fileID: 508924469}
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2401461192666499815, guid: 71d12b53bfe275a42b91a98a3e6e2f66, type: 3}
|
||||
propertyPath: _networkObjectCache
|
||||
value:
|
||||
objectReference: {fileID: 508924470}
|
||||
- target: {fileID: 2401461192666499815, guid: 71d12b53bfe275a42b91a98a3e6e2f66, type: 3}
|
||||
propertyPath: _componentIndexCache
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2467740212711513134, guid: 71d12b53bfe275a42b91a98a3e6e2f66, type: 3}
|
||||
propertyPath: m_Size.x
|
||||
value: 12.521683
|
||||
value: 0.89100313
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2467740212711513134, guid: 71d12b53bfe275a42b91a98a3e6e2f66, type: 3}
|
||||
propertyPath: m_Size.y
|
||||
value: 0.8030002
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2467740212711513134, guid: 71d12b53bfe275a42b91a98a3e6e2f66, type: 3}
|
||||
propertyPath: m_Offset.x
|
||||
value: 2.6581507
|
||||
value: 0.00040507317
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2467740212711513134, guid: 71d12b53bfe275a42b91a98a3e6e2f66, type: 3}
|
||||
propertyPath: m_Offset.y
|
||||
value: -0.007763982
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2467740212711513134, guid: 71d12b53bfe275a42b91a98a3e6e2f66, type: 3}
|
||||
propertyPath: m_IsTrigger
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2467740212711513134, guid: 71d12b53bfe275a42b91a98a3e6e2f66, type: 3}
|
||||
propertyPath: m_SpriteTilingProperty.pivot.x
|
||||
value: 0.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2467740212711513134, guid: 71d12b53bfe275a42b91a98a3e6e2f66, type: 3}
|
||||
propertyPath: m_SpriteTilingProperty.pivot.y
|
||||
value: 0.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2467740212711513134, guid: 71d12b53bfe275a42b91a98a3e6e2f66, type: 3}
|
||||
propertyPath: m_SpriteTilingProperty.newSize.x
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2467740212711513134, guid: 71d12b53bfe275a42b91a98a3e6e2f66, type: 3}
|
||||
propertyPath: m_SpriteTilingProperty.newSize.y
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2467740212711513134, guid: 71d12b53bfe275a42b91a98a3e6e2f66, type: 3}
|
||||
propertyPath: m_SpriteTilingProperty.oldSize.x
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2467740212711513134, guid: 71d12b53bfe275a42b91a98a3e6e2f66, type: 3}
|
||||
propertyPath: m_SpriteTilingProperty.oldSize.y
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2467740212711513134, guid: 71d12b53bfe275a42b91a98a3e6e2f66, type: 3}
|
||||
propertyPath: m_SpriteTilingProperty.adaptiveTilingThreshold
|
||||
value: 0.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3463712308332304479, guid: 71d12b53bfe275a42b91a98a3e6e2f66, type: 3}
|
||||
propertyPath: m_Name
|
||||
value: SceneChangeTrigger
|
||||
|
|
@ -2039,11 +2083,11 @@ PrefabInstance:
|
|||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4423685822788232243, guid: 71d12b53bfe275a42b91a98a3e6e2f66, type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: -0.54
|
||||
value: -1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4423685822788232243, guid: 71d12b53bfe275a42b91a98a3e6e2f66, type: 3}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: -1.54
|
||||
value: -2
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4423685822788232243, guid: 71d12b53bfe275a42b91a98a3e6e2f66, type: 3}
|
||||
propertyPath: m_LocalPosition.z
|
||||
|
|
@ -2077,24 +2121,46 @@ PrefabInstance:
|
|||
propertyPath: m_LocalEulerAnglesHint.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5186788049215247401, guid: 71d12b53bfe275a42b91a98a3e6e2f66, type: 3}
|
||||
propertyPath: _isSpawnable
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5186788049215247401, guid: 71d12b53bfe275a42b91a98a3e6e2f66, type: 3}
|
||||
propertyPath: <SceneId>k__BackingField
|
||||
value: 4009740927
|
||||
value: 4007611127
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5186788049215247401, guid: 71d12b53bfe275a42b91a98a3e6e2f66, type: 3}
|
||||
propertyPath: _networkBehaviours.Array.size
|
||||
value: 2
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5186788049215247401, guid: 71d12b53bfe275a42b91a98a3e6e2f66, type: 3}
|
||||
propertyPath: _networkBehaviours.Array.data[0]
|
||||
value:
|
||||
objectReference: {fileID: 802857232}
|
||||
- target: {fileID: 5186788049215247401, guid: 71d12b53bfe275a42b91a98a3e6e2f66, type: 3}
|
||||
propertyPath: _networkBehaviours.Array.data[1]
|
||||
value:
|
||||
objectReference: {fileID: 802857225}
|
||||
- target: {fileID: 5186788049215247401, guid: 71d12b53bfe275a42b91a98a3e6e2f66, type: 3}
|
||||
propertyPath: _networkBehaviours.Array.data[2]
|
||||
value:
|
||||
objectReference: {fileID: 802857225}
|
||||
- target: {fileID: 5551679991364744983, guid: 71d12b53bfe275a42b91a98a3e6e2f66, type: 3}
|
||||
propertyPath: _networkObjectCache
|
||||
value:
|
||||
objectReference: {fileID: 508924470}
|
||||
- target: {fileID: 9091365521926218355, guid: 71d12b53bfe275a42b91a98a3e6e2f66, type: 3}
|
||||
propertyPath: _networkObjectCache
|
||||
value:
|
||||
objectReference: {fileID: 508924470}
|
||||
- target: {fileID: 9091365521926218355, guid: 71d12b53bfe275a42b91a98a3e6e2f66, type: 3}
|
||||
propertyPath: _componentIndexCache
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents:
|
||||
- {fileID: 665168782243639684, guid: 71d12b53bfe275a42b91a98a3e6e2f66, type: 3}
|
||||
- {fileID: 9091365521926218355, guid: 71d12b53bfe275a42b91a98a3e6e2f66, type: 3}
|
||||
- {fileID: 5551679991364744983, guid: 71d12b53bfe275a42b91a98a3e6e2f66, type: 3}
|
||||
m_RemovedGameObjects: []
|
||||
m_AddedGameObjects: []
|
||||
m_AddedComponents:
|
||||
|
|
@ -2104,18 +2170,10 @@ PrefabInstance:
|
|||
- targetCorrespondingSourceObject: {fileID: 3463712308332304479, guid: 71d12b53bfe275a42b91a98a3e6e2f66, type: 3}
|
||||
insertIndex: -1
|
||||
addedObject: {fileID: 802857226}
|
||||
- targetCorrespondingSourceObject: {fileID: 3463712308332304479, guid: 71d12b53bfe275a42b91a98a3e6e2f66, type: 3}
|
||||
insertIndex: -1
|
||||
addedObject: {fileID: 802857229}
|
||||
m_SourcePrefab: {fileID: 100100000, guid: 71d12b53bfe275a42b91a98a3e6e2f66, type: 3}
|
||||
--- !u!114 &508924469 stripped
|
||||
MonoBehaviour:
|
||||
m_CorrespondingSourceObject: {fileID: 5551679991364744983, guid: 71d12b53bfe275a42b91a98a3e6e2f66, type: 3}
|
||||
m_PrefabInstance: {fileID: 508924468}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 802857222}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: be3cb2952c351714c963b0766f53cef3, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
--- !u!114 &508924470 stripped
|
||||
MonoBehaviour:
|
||||
m_CorrespondingSourceObject: {fileID: 5186788049215247401, guid: 71d12b53bfe275a42b91a98a3e6e2f66, type: 3}
|
||||
|
|
@ -3634,8 +3692,7 @@ MonoBehaviour:
|
|||
_addedNetworkObject: {fileID: 508924470}
|
||||
_networkObjectCache: {fileID: 508924470}
|
||||
sceneName: FarmMap
|
||||
SceneStack: 0
|
||||
spawnPosition: {x: 30, y: 30, z: 0}
|
||||
spawnPosition: {x: 30, y: -30, z: 0}
|
||||
--- !u!114 &802857226
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -3648,10 +3705,73 @@ MonoBehaviour:
|
|||
m_Script: {fileID: 11500000, guid: c71fd7f855ec523429999fc4e14a1928, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
_overrideType: 2
|
||||
_overrideType: 3
|
||||
_updateHostVisibility: 1
|
||||
_observerConditions:
|
||||
- {fileID: 11400000, guid: 2033f54fd2794464bae08fa5a55c8996, type: 2}
|
||||
--- !u!212 &802857229
|
||||
SpriteRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 802857222}
|
||||
m_Enabled: 1
|
||||
m_CastShadows: 0
|
||||
m_ReceiveShadows: 0
|
||||
m_DynamicOccludee: 1
|
||||
m_StaticShadowCaster: 0
|
||||
m_MotionVectors: 1
|
||||
m_LightProbeUsage: 1
|
||||
m_ReflectionProbeUsage: 1
|
||||
m_RayTracingMode: 0
|
||||
m_RayTraceProcedural: 0
|
||||
m_RenderingLayerMask: 1
|
||||
m_RendererPriority: 0
|
||||
m_Materials:
|
||||
- {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2}
|
||||
m_StaticBatchInfo:
|
||||
firstSubMesh: 0
|
||||
subMeshCount: 0
|
||||
m_StaticBatchRoot: {fileID: 0}
|
||||
m_ProbeAnchor: {fileID: 0}
|
||||
m_LightProbeVolumeOverride: {fileID: 0}
|
||||
m_ScaleInLightmap: 1
|
||||
m_ReceiveGI: 1
|
||||
m_PreserveUVs: 0
|
||||
m_IgnoreNormalsForChartDetection: 0
|
||||
m_ImportantGI: 0
|
||||
m_StitchLightmapSeams: 1
|
||||
m_SelectedEditorRenderState: 0
|
||||
m_MinimumChartSize: 4
|
||||
m_AutoUVMaxDistance: 0.5
|
||||
m_AutoUVMaxAngle: 89
|
||||
m_LightmapParameters: {fileID: 0}
|
||||
m_SortingLayerID: 0
|
||||
m_SortingLayer: 0
|
||||
m_SortingOrder: 0
|
||||
m_Sprite: {fileID: -1244154544, guid: ac70ce904d41b844db3b71749443b7dd, type: 3}
|
||||
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_FlipX: 0
|
||||
m_FlipY: 0
|
||||
m_DrawMode: 0
|
||||
m_Size: {x: 1, y: 1}
|
||||
m_AdaptiveModeThreshold: 0.5
|
||||
m_SpriteTileMode: 0
|
||||
m_WasSpriteAssigned: 1
|
||||
m_MaskInteraction: 0
|
||||
m_SpriteSortPoint: 0
|
||||
--- !u!114 &802857232 stripped
|
||||
MonoBehaviour:
|
||||
m_CorrespondingSourceObject: {fileID: 2401461192666499815, guid: 71d12b53bfe275a42b91a98a3e6e2f66, type: 3}
|
||||
m_PrefabInstance: {fileID: 508924468}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 802857222}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: a60424afcf0b5984dbe878a1f21c10b2, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
--- !u!1 &804445073
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -1,5 +1,5 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 6de5f693aca544b4bad9e1c5025ac433
|
||||
guid: 7a42459ad10bca344967680925d53f7c
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
|
|
@ -1,5 +1,5 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 6264ad8b345cf4c49a5ef6f305165f1c
|
||||
guid: 22076678cede1d049affe74e8ac3ecf4
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
File diff suppressed because it is too large
Load Diff
|
|
@ -1,5 +1,5 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 1ed5b35ea681aa94eb527f275ec55aee
|
||||
guid: 9f8ed20194c9ce44a88d66deeab318ca
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
File diff suppressed because it is too large
Load Diff
|
|
@ -1,5 +1,5 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 6ade19d133834a04796ba0c514e2d5bb
|
||||
guid: 3dc1045b55c68a44da25debeaba1eafe
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
|
|
@ -0,0 +1,7 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 094aa63f5ddab72419bc399420c648ba
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
|
|
@ -2016,19 +2016,63 @@ PrefabInstance:
|
|||
- target: {fileID: -4658507409231842436, guid: 71d12b53bfe275a42b91a98a3e6e2f66, type: 3}
|
||||
propertyPath: _networkBehaviours.Array.data[0]
|
||||
value:
|
||||
objectReference: {fileID: 508924469}
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2401461192666499815, guid: 71d12b53bfe275a42b91a98a3e6e2f66, type: 3}
|
||||
propertyPath: _networkObjectCache
|
||||
value:
|
||||
objectReference: {fileID: 508924470}
|
||||
- target: {fileID: 2401461192666499815, guid: 71d12b53bfe275a42b91a98a3e6e2f66, type: 3}
|
||||
propertyPath: _componentIndexCache
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2467740212711513134, guid: 71d12b53bfe275a42b91a98a3e6e2f66, type: 3}
|
||||
propertyPath: m_Size.x
|
||||
value: 12.521683
|
||||
value: 0.89100313
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2467740212711513134, guid: 71d12b53bfe275a42b91a98a3e6e2f66, type: 3}
|
||||
propertyPath: m_Size.y
|
||||
value: 0.8030002
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2467740212711513134, guid: 71d12b53bfe275a42b91a98a3e6e2f66, type: 3}
|
||||
propertyPath: m_Offset.x
|
||||
value: 2.6581507
|
||||
value: 0.00040507317
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2467740212711513134, guid: 71d12b53bfe275a42b91a98a3e6e2f66, type: 3}
|
||||
propertyPath: m_Offset.y
|
||||
value: -0.007763982
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2467740212711513134, guid: 71d12b53bfe275a42b91a98a3e6e2f66, type: 3}
|
||||
propertyPath: m_IsTrigger
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2467740212711513134, guid: 71d12b53bfe275a42b91a98a3e6e2f66, type: 3}
|
||||
propertyPath: m_SpriteTilingProperty.pivot.x
|
||||
value: 0.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2467740212711513134, guid: 71d12b53bfe275a42b91a98a3e6e2f66, type: 3}
|
||||
propertyPath: m_SpriteTilingProperty.pivot.y
|
||||
value: 0.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2467740212711513134, guid: 71d12b53bfe275a42b91a98a3e6e2f66, type: 3}
|
||||
propertyPath: m_SpriteTilingProperty.newSize.x
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2467740212711513134, guid: 71d12b53bfe275a42b91a98a3e6e2f66, type: 3}
|
||||
propertyPath: m_SpriteTilingProperty.newSize.y
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2467740212711513134, guid: 71d12b53bfe275a42b91a98a3e6e2f66, type: 3}
|
||||
propertyPath: m_SpriteTilingProperty.oldSize.x
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2467740212711513134, guid: 71d12b53bfe275a42b91a98a3e6e2f66, type: 3}
|
||||
propertyPath: m_SpriteTilingProperty.oldSize.y
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2467740212711513134, guid: 71d12b53bfe275a42b91a98a3e6e2f66, type: 3}
|
||||
propertyPath: m_SpriteTilingProperty.adaptiveTilingThreshold
|
||||
value: 0.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3463712308332304479, guid: 71d12b53bfe275a42b91a98a3e6e2f66, type: 3}
|
||||
propertyPath: m_Name
|
||||
value: SceneChangeTrigger
|
||||
|
|
@ -2039,11 +2083,11 @@ PrefabInstance:
|
|||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4423685822788232243, guid: 71d12b53bfe275a42b91a98a3e6e2f66, type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: -0.54
|
||||
value: -1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4423685822788232243, guid: 71d12b53bfe275a42b91a98a3e6e2f66, type: 3}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: -1.54
|
||||
value: -2
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4423685822788232243, guid: 71d12b53bfe275a42b91a98a3e6e2f66, type: 3}
|
||||
propertyPath: m_LocalPosition.z
|
||||
|
|
@ -2077,24 +2121,46 @@ PrefabInstance:
|
|||
propertyPath: m_LocalEulerAnglesHint.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5186788049215247401, guid: 71d12b53bfe275a42b91a98a3e6e2f66, type: 3}
|
||||
propertyPath: _isSpawnable
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5186788049215247401, guid: 71d12b53bfe275a42b91a98a3e6e2f66, type: 3}
|
||||
propertyPath: <SceneId>k__BackingField
|
||||
value: 2146407159
|
||||
value: 4277082751
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5186788049215247401, guid: 71d12b53bfe275a42b91a98a3e6e2f66, type: 3}
|
||||
propertyPath: _networkBehaviours.Array.size
|
||||
value: 2
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5186788049215247401, guid: 71d12b53bfe275a42b91a98a3e6e2f66, type: 3}
|
||||
propertyPath: _networkBehaviours.Array.data[0]
|
||||
value:
|
||||
objectReference: {fileID: 802857232}
|
||||
- target: {fileID: 5186788049215247401, guid: 71d12b53bfe275a42b91a98a3e6e2f66, type: 3}
|
||||
propertyPath: _networkBehaviours.Array.data[1]
|
||||
value:
|
||||
objectReference: {fileID: 802857225}
|
||||
- target: {fileID: 5186788049215247401, guid: 71d12b53bfe275a42b91a98a3e6e2f66, type: 3}
|
||||
propertyPath: _networkBehaviours.Array.data[2]
|
||||
value:
|
||||
objectReference: {fileID: 802857225}
|
||||
- target: {fileID: 5551679991364744983, guid: 71d12b53bfe275a42b91a98a3e6e2f66, type: 3}
|
||||
propertyPath: _networkObjectCache
|
||||
value:
|
||||
objectReference: {fileID: 508924470}
|
||||
- target: {fileID: 9091365521926218355, guid: 71d12b53bfe275a42b91a98a3e6e2f66, type: 3}
|
||||
propertyPath: _networkObjectCache
|
||||
value:
|
||||
objectReference: {fileID: 508924470}
|
||||
- target: {fileID: 9091365521926218355, guid: 71d12b53bfe275a42b91a98a3e6e2f66, type: 3}
|
||||
propertyPath: _componentIndexCache
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents:
|
||||
- {fileID: 665168782243639684, guid: 71d12b53bfe275a42b91a98a3e6e2f66, type: 3}
|
||||
- {fileID: 9091365521926218355, guid: 71d12b53bfe275a42b91a98a3e6e2f66, type: 3}
|
||||
- {fileID: 5551679991364744983, guid: 71d12b53bfe275a42b91a98a3e6e2f66, type: 3}
|
||||
m_RemovedGameObjects: []
|
||||
m_AddedGameObjects: []
|
||||
m_AddedComponents:
|
||||
|
|
@ -2104,18 +2170,10 @@ PrefabInstance:
|
|||
- targetCorrespondingSourceObject: {fileID: 3463712308332304479, guid: 71d12b53bfe275a42b91a98a3e6e2f66, type: 3}
|
||||
insertIndex: -1
|
||||
addedObject: {fileID: 802857226}
|
||||
- targetCorrespondingSourceObject: {fileID: 3463712308332304479, guid: 71d12b53bfe275a42b91a98a3e6e2f66, type: 3}
|
||||
insertIndex: -1
|
||||
addedObject: {fileID: 802857229}
|
||||
m_SourcePrefab: {fileID: 100100000, guid: 71d12b53bfe275a42b91a98a3e6e2f66, type: 3}
|
||||
--- !u!114 &508924469 stripped
|
||||
MonoBehaviour:
|
||||
m_CorrespondingSourceObject: {fileID: 5551679991364744983, guid: 71d12b53bfe275a42b91a98a3e6e2f66, type: 3}
|
||||
m_PrefabInstance: {fileID: 508924468}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 802857222}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: be3cb2952c351714c963b0766f53cef3, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
--- !u!114 &508924470 stripped
|
||||
MonoBehaviour:
|
||||
m_CorrespondingSourceObject: {fileID: 5186788049215247401, guid: 71d12b53bfe275a42b91a98a3e6e2f66, type: 3}
|
||||
|
|
@ -3634,8 +3692,7 @@ MonoBehaviour:
|
|||
_addedNetworkObject: {fileID: 508924470}
|
||||
_networkObjectCache: {fileID: 508924470}
|
||||
sceneName: FarmMap
|
||||
SceneStack: 0
|
||||
spawnPosition: {x: 30, y: 30, z: 0}
|
||||
spawnPosition: {x: 30, y: -30, z: 0}
|
||||
--- !u!114 &802857226
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -3652,6 +3709,69 @@ MonoBehaviour:
|
|||
_updateHostVisibility: 1
|
||||
_observerConditions:
|
||||
- {fileID: 11400000, guid: 2033f54fd2794464bae08fa5a55c8996, type: 2}
|
||||
--- !u!212 &802857229
|
||||
SpriteRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 802857222}
|
||||
m_Enabled: 1
|
||||
m_CastShadows: 0
|
||||
m_ReceiveShadows: 0
|
||||
m_DynamicOccludee: 1
|
||||
m_StaticShadowCaster: 0
|
||||
m_MotionVectors: 1
|
||||
m_LightProbeUsage: 1
|
||||
m_ReflectionProbeUsage: 1
|
||||
m_RayTracingMode: 0
|
||||
m_RayTraceProcedural: 0
|
||||
m_RenderingLayerMask: 1
|
||||
m_RendererPriority: 0
|
||||
m_Materials:
|
||||
- {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2}
|
||||
m_StaticBatchInfo:
|
||||
firstSubMesh: 0
|
||||
subMeshCount: 0
|
||||
m_StaticBatchRoot: {fileID: 0}
|
||||
m_ProbeAnchor: {fileID: 0}
|
||||
m_LightProbeVolumeOverride: {fileID: 0}
|
||||
m_ScaleInLightmap: 1
|
||||
m_ReceiveGI: 1
|
||||
m_PreserveUVs: 0
|
||||
m_IgnoreNormalsForChartDetection: 0
|
||||
m_ImportantGI: 0
|
||||
m_StitchLightmapSeams: 1
|
||||
m_SelectedEditorRenderState: 0
|
||||
m_MinimumChartSize: 4
|
||||
m_AutoUVMaxDistance: 0.5
|
||||
m_AutoUVMaxAngle: 89
|
||||
m_LightmapParameters: {fileID: 0}
|
||||
m_SortingLayerID: 0
|
||||
m_SortingLayer: 0
|
||||
m_SortingOrder: 0
|
||||
m_Sprite: {fileID: -1244154544, guid: ac70ce904d41b844db3b71749443b7dd, type: 3}
|
||||
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_FlipX: 0
|
||||
m_FlipY: 0
|
||||
m_DrawMode: 0
|
||||
m_Size: {x: 1, y: 1}
|
||||
m_AdaptiveModeThreshold: 0.5
|
||||
m_SpriteTileMode: 0
|
||||
m_WasSpriteAssigned: 1
|
||||
m_MaskInteraction: 0
|
||||
m_SpriteSortPoint: 0
|
||||
--- !u!114 &802857232 stripped
|
||||
MonoBehaviour:
|
||||
m_CorrespondingSourceObject: {fileID: 2401461192666499815, guid: 71d12b53bfe275a42b91a98a3e6e2f66, type: 3}
|
||||
m_PrefabInstance: {fileID: 508924468}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 802857222}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: a60424afcf0b5984dbe878a1f21c10b2, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
--- !u!1 &804445073
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -0,0 +1,7 @@
|
|||
fileFormatVersion: 2
|
||||
guid: b49383ae61fe7864fb0d3eb05883356b
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
|
|
@ -2019,16 +2019,52 @@ PrefabInstance:
|
|||
objectReference: {fileID: 508924469}
|
||||
- target: {fileID: 2467740212711513134, guid: 71d12b53bfe275a42b91a98a3e6e2f66, type: 3}
|
||||
propertyPath: m_Size.x
|
||||
value: 12.521683
|
||||
value: 0.89100313
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2467740212711513134, guid: 71d12b53bfe275a42b91a98a3e6e2f66, type: 3}
|
||||
propertyPath: m_Size.y
|
||||
value: 0.8030002
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2467740212711513134, guid: 71d12b53bfe275a42b91a98a3e6e2f66, type: 3}
|
||||
propertyPath: m_Offset.x
|
||||
value: 2.6581507
|
||||
value: 0.00040507317
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2467740212711513134, guid: 71d12b53bfe275a42b91a98a3e6e2f66, type: 3}
|
||||
propertyPath: m_Offset.y
|
||||
value: -0.007763982
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2467740212711513134, guid: 71d12b53bfe275a42b91a98a3e6e2f66, type: 3}
|
||||
propertyPath: m_IsTrigger
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2467740212711513134, guid: 71d12b53bfe275a42b91a98a3e6e2f66, type: 3}
|
||||
propertyPath: m_SpriteTilingProperty.pivot.x
|
||||
value: 0.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2467740212711513134, guid: 71d12b53bfe275a42b91a98a3e6e2f66, type: 3}
|
||||
propertyPath: m_SpriteTilingProperty.pivot.y
|
||||
value: 0.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2467740212711513134, guid: 71d12b53bfe275a42b91a98a3e6e2f66, type: 3}
|
||||
propertyPath: m_SpriteTilingProperty.newSize.x
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2467740212711513134, guid: 71d12b53bfe275a42b91a98a3e6e2f66, type: 3}
|
||||
propertyPath: m_SpriteTilingProperty.newSize.y
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2467740212711513134, guid: 71d12b53bfe275a42b91a98a3e6e2f66, type: 3}
|
||||
propertyPath: m_SpriteTilingProperty.oldSize.x
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2467740212711513134, guid: 71d12b53bfe275a42b91a98a3e6e2f66, type: 3}
|
||||
propertyPath: m_SpriteTilingProperty.oldSize.y
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2467740212711513134, guid: 71d12b53bfe275a42b91a98a3e6e2f66, type: 3}
|
||||
propertyPath: m_SpriteTilingProperty.adaptiveTilingThreshold
|
||||
value: 0.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3463712308332304479, guid: 71d12b53bfe275a42b91a98a3e6e2f66, type: 3}
|
||||
propertyPath: m_Name
|
||||
value: SceneChangeTrigger
|
||||
|
|
@ -2039,11 +2075,11 @@ PrefabInstance:
|
|||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4423685822788232243, guid: 71d12b53bfe275a42b91a98a3e6e2f66, type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: -0.54
|
||||
value: -1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4423685822788232243, guid: 71d12b53bfe275a42b91a98a3e6e2f66, type: 3}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: -1.54
|
||||
value: -2
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4423685822788232243, guid: 71d12b53bfe275a42b91a98a3e6e2f66, type: 3}
|
||||
propertyPath: m_LocalPosition.z
|
||||
|
|
@ -2077,22 +2113,38 @@ PrefabInstance:
|
|||
propertyPath: m_LocalEulerAnglesHint.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5186788049215247401, guid: 71d12b53bfe275a42b91a98a3e6e2f66, type: 3}
|
||||
propertyPath: _isSpawnable
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5186788049215247401, guid: 71d12b53bfe275a42b91a98a3e6e2f66, type: 3}
|
||||
propertyPath: <SceneId>k__BackingField
|
||||
value: 2127515391
|
||||
value: 2146401015
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5186788049215247401, guid: 71d12b53bfe275a42b91a98a3e6e2f66, type: 3}
|
||||
propertyPath: _networkBehaviours.Array.size
|
||||
value: 2
|
||||
value: 3
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5186788049215247401, guid: 71d12b53bfe275a42b91a98a3e6e2f66, type: 3}
|
||||
propertyPath: _networkBehaviours.Array.data[1]
|
||||
value:
|
||||
objectReference: {fileID: 508924471}
|
||||
- target: {fileID: 5186788049215247401, guid: 71d12b53bfe275a42b91a98a3e6e2f66, type: 3}
|
||||
propertyPath: _networkBehaviours.Array.data[2]
|
||||
value:
|
||||
objectReference: {fileID: 802857225}
|
||||
- target: {fileID: 5551679991364744983, guid: 71d12b53bfe275a42b91a98a3e6e2f66, type: 3}
|
||||
propertyPath: _networkObjectCache
|
||||
value:
|
||||
objectReference: {fileID: 508924470}
|
||||
- target: {fileID: 9091365521926218355, guid: 71d12b53bfe275a42b91a98a3e6e2f66, type: 3}
|
||||
propertyPath: _networkObjectCache
|
||||
value:
|
||||
objectReference: {fileID: 508924470}
|
||||
- target: {fileID: 9091365521926218355, guid: 71d12b53bfe275a42b91a98a3e6e2f66, type: 3}
|
||||
propertyPath: _componentIndexCache
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents:
|
||||
- {fileID: 665168782243639684, guid: 71d12b53bfe275a42b91a98a3e6e2f66, type: 3}
|
||||
m_RemovedGameObjects: []
|
||||
|
|
@ -2104,6 +2156,9 @@ PrefabInstance:
|
|||
- targetCorrespondingSourceObject: {fileID: 3463712308332304479, guid: 71d12b53bfe275a42b91a98a3e6e2f66, type: 3}
|
||||
insertIndex: -1
|
||||
addedObject: {fileID: 802857226}
|
||||
- targetCorrespondingSourceObject: {fileID: 3463712308332304479, guid: 71d12b53bfe275a42b91a98a3e6e2f66, type: 3}
|
||||
insertIndex: -1
|
||||
addedObject: {fileID: 802857229}
|
||||
m_SourcePrefab: {fileID: 100100000, guid: 71d12b53bfe275a42b91a98a3e6e2f66, type: 3}
|
||||
--- !u!114 &508924469 stripped
|
||||
MonoBehaviour:
|
||||
|
|
@ -2127,6 +2182,17 @@ MonoBehaviour:
|
|||
m_Script: {fileID: 11500000, guid: 26b716c41e9b56b4baafaf13a523ba2e, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
--- !u!114 &508924471 stripped
|
||||
MonoBehaviour:
|
||||
m_CorrespondingSourceObject: {fileID: 9091365521926218355, guid: 71d12b53bfe275a42b91a98a3e6e2f66, type: 3}
|
||||
m_PrefabInstance: {fileID: 508924468}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 802857222}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 624abc0263964a90b146b5a469faec83, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
--- !u!1 &520835285
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -3630,12 +3696,11 @@ MonoBehaviour:
|
|||
m_Script: {fileID: 11500000, guid: 624abc0263964a90b146b5a469faec83, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
_componentIndexCache: 1
|
||||
_componentIndexCache: 3
|
||||
_addedNetworkObject: {fileID: 508924470}
|
||||
_networkObjectCache: {fileID: 508924470}
|
||||
sceneName: FarmMap
|
||||
SceneStack: 0
|
||||
spawnPosition: {x: 30, y: 30, z: 0}
|
||||
spawnPosition: {x: 30, y: -30, z: 0}
|
||||
--- !u!114 &802857226
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -3648,10 +3713,62 @@ MonoBehaviour:
|
|||
m_Script: {fileID: 11500000, guid: c71fd7f855ec523429999fc4e14a1928, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
_overrideType: 2
|
||||
_overrideType: 3
|
||||
_updateHostVisibility: 1
|
||||
_observerConditions:
|
||||
- {fileID: 11400000, guid: 2033f54fd2794464bae08fa5a55c8996, type: 2}
|
||||
--- !u!212 &802857229
|
||||
SpriteRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 802857222}
|
||||
m_Enabled: 1
|
||||
m_CastShadows: 0
|
||||
m_ReceiveShadows: 0
|
||||
m_DynamicOccludee: 1
|
||||
m_StaticShadowCaster: 0
|
||||
m_MotionVectors: 1
|
||||
m_LightProbeUsage: 1
|
||||
m_ReflectionProbeUsage: 1
|
||||
m_RayTracingMode: 0
|
||||
m_RayTraceProcedural: 0
|
||||
m_RenderingLayerMask: 1
|
||||
m_RendererPriority: 0
|
||||
m_Materials:
|
||||
- {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2}
|
||||
m_StaticBatchInfo:
|
||||
firstSubMesh: 0
|
||||
subMeshCount: 0
|
||||
m_StaticBatchRoot: {fileID: 0}
|
||||
m_ProbeAnchor: {fileID: 0}
|
||||
m_LightProbeVolumeOverride: {fileID: 0}
|
||||
m_ScaleInLightmap: 1
|
||||
m_ReceiveGI: 1
|
||||
m_PreserveUVs: 0
|
||||
m_IgnoreNormalsForChartDetection: 0
|
||||
m_ImportantGI: 0
|
||||
m_StitchLightmapSeams: 1
|
||||
m_SelectedEditorRenderState: 0
|
||||
m_MinimumChartSize: 4
|
||||
m_AutoUVMaxDistance: 0.5
|
||||
m_AutoUVMaxAngle: 89
|
||||
m_LightmapParameters: {fileID: 0}
|
||||
m_SortingLayerID: 0
|
||||
m_SortingLayer: 0
|
||||
m_SortingOrder: 0
|
||||
m_Sprite: {fileID: -1244154544, guid: ac70ce904d41b844db3b71749443b7dd, type: 3}
|
||||
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_FlipX: 0
|
||||
m_FlipY: 0
|
||||
m_DrawMode: 0
|
||||
m_Size: {x: 1, y: 1}
|
||||
m_AdaptiveModeThreshold: 0.5
|
||||
m_SpriteTileMode: 0
|
||||
m_WasSpriteAssigned: 1
|
||||
m_MaskInteraction: 0
|
||||
m_SpriteSortPoint: 0
|
||||
--- !u!1 &804445073
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -0,0 +1,7 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 369b4a8336c2c874993945c72456f249
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
|
|
@ -1,7 +0,0 @@
|
|||
fileFormatVersion: 2
|
||||
guid: d4a891ce4a277a14797ac62961406fce
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
File diff suppressed because it is too large
Load Diff
|
|
@ -1,7 +0,0 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 42fe1881572db4e49abe248f2eb4c83a
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
File diff suppressed because it is too large
Load Diff
|
|
@ -1,7 +0,0 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 48875e2fc8a635f4289a022d196808e8
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
File diff suppressed because it is too large
Load Diff
|
|
@ -15,7 +15,6 @@ MonoBehaviour:
|
|||
_prefabs:
|
||||
- {fileID: 1155193144633609695, guid: d27075628330ae74082130fac9663ba3, type: 3}
|
||||
- {fileID: 7500446676508545717, guid: 59b693825ff89ae4b9e44b83dfd8995a, type: 3}
|
||||
- {fileID: 5186788049215247401, guid: 71d12b53bfe275a42b91a98a3e6e2f66, type: 3}
|
||||
- {fileID: 1155193144633609695, guid: 04359b8867a2d794aad6b521a16e8d21, type: 3}
|
||||
- {fileID: -2542377431188024441, guid: ec6b0b736b8df5645b048f732b88473e, type: 3}
|
||||
- {fileID: 3253055754781524931, guid: 84925f66541b72d48bff705463be621f, type: 3}
|
||||
|
|
|
|||
|
|
@ -13,6 +13,5 @@ MonoBehaviour:
|
|||
m_Name: DistanceCondition
|
||||
m_EditorClassIdentifier:
|
||||
NetworkObject: {fileID: 0}
|
||||
_maximumDistance: 10
|
||||
_maximumDistance: 15.51
|
||||
_hideDistancePercent: 0.1
|
||||
UpdateFrequency: 0
|
||||
|
|
|
|||
|
|
@ -27,7 +27,7 @@ MonoBehaviour:
|
|||
magic: 0
|
||||
sanity: 0
|
||||
maxSanity: 0
|
||||
moveSpeed: 0
|
||||
moveSpeed: 5
|
||||
movingRight: 0
|
||||
movingLeft: 0
|
||||
movingDown: 0
|
||||
|
|
|
|||
|
|
@ -56,7 +56,12 @@ MonoBehaviour:
|
|||
_componentIndexCache: 0
|
||||
_addedNetworkObject: {fileID: 1155193144633609695}
|
||||
_networkObjectCache: {fileID: 1155193144633609695}
|
||||
currentState: 0
|
||||
saveManager: {fileID: 0}
|
||||
hotkeyManager: {fileID: 0}
|
||||
audioManager: {fileID: 0}
|
||||
uiManager: {fileID: 0}
|
||||
gameManagerPlayer: {fileID: 0}
|
||||
itemDatabase: {fileID: 0}
|
||||
--- !u!114 &163830432344110876
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -82,7 +87,7 @@ MonoBehaviour:
|
|||
m_Script: {fileID: 11500000, guid: a63366092cd940258ce1eb295c2697aa, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
currentMap: {fileID: 0}
|
||||
currentMapSo: {fileID: 0}
|
||||
--- !u!114 &8579453406728153826
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -95,6 +100,9 @@ MonoBehaviour:
|
|||
m_Script: {fileID: 11500000, guid: 0f6eb69f2c964afb864140ddb42c39c6, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
_componentIndexCache: 1
|
||||
_addedNetworkObject: {fileID: 1155193144633609695}
|
||||
_networkObjectCache: {fileID: 1155193144633609695}
|
||||
--- !u!114 &9104312956640827141
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -125,6 +133,7 @@ MonoBehaviour:
|
|||
<PredictedSpawn>k__BackingField: {fileID: 0}
|
||||
_networkBehaviours:
|
||||
- {fileID: 99402216570785473}
|
||||
- {fileID: 8579453406728153826}
|
||||
<SerializedRootNetworkBehaviour>k__BackingField: {fileID: 0}
|
||||
<NestedRootNetworkBehaviours>k__BackingField: []
|
||||
SerializedTransformProperties:
|
||||
|
|
|
|||
|
|
@ -147,7 +147,7 @@ MonoBehaviour:
|
|||
m_EditorClassIdentifier:
|
||||
_componentIndexCache: 0
|
||||
_addedNetworkObject: {fileID: -2542377431188024441}
|
||||
_networkObjectCache: {fileID: 0}
|
||||
_networkObjectCache: {fileID: -2542377431188024441}
|
||||
spriteRenderer: {fileID: 0}
|
||||
isWatered: 0
|
||||
interactable: {fileID: 11400000, guid: 26b3b7aeddb33354685b9d9e694071ce, type: 2}
|
||||
|
|
@ -181,7 +181,8 @@ MonoBehaviour:
|
|||
<IsNested>k__BackingField: 0
|
||||
<ComponentIndex>k__BackingField: 0
|
||||
<PredictedSpawn>k__BackingField: {fileID: 0}
|
||||
_networkBehaviours: []
|
||||
_networkBehaviours:
|
||||
- {fileID: 2123363971034243866}
|
||||
<SerializedRootNetworkBehaviour>k__BackingField: {fileID: 0}
|
||||
<NestedRootNetworkBehaviours>k__BackingField: []
|
||||
SerializedTransformProperties:
|
||||
|
|
@ -207,7 +208,7 @@ MonoBehaviour:
|
|||
_spectatorInterpolation: 2
|
||||
_enableTeleport: 0
|
||||
_teleportThreshold: 1
|
||||
<PrefabId>k__BackingField: 0
|
||||
<PrefabId>k__BackingField: 4
|
||||
<SpawnableCollectionId>k__BackingField: 0
|
||||
<SceneId>k__BackingField: 0
|
||||
<AssetPathHash>k__BackingField: 8108906286829648474
|
||||
|
|
|
|||
|
|
@ -147,7 +147,7 @@ MonoBehaviour:
|
|||
m_EditorClassIdentifier:
|
||||
_componentIndexCache: 0
|
||||
_addedNetworkObject: {fileID: 3253055754781524931}
|
||||
_networkObjectCache: {fileID: 0}
|
||||
_networkObjectCache: {fileID: 3253055754781524931}
|
||||
spriteRenderer: {fileID: 4422298301363191958}
|
||||
isWatered: 0
|
||||
interactable: {fileID: 11400000, guid: 26b3b7aeddb33354685b9d9e694071ce, type: 2}
|
||||
|
|
@ -181,7 +181,8 @@ MonoBehaviour:
|
|||
<IsNested>k__BackingField: 0
|
||||
<ComponentIndex>k__BackingField: 0
|
||||
<PredictedSpawn>k__BackingField: {fileID: 0}
|
||||
_networkBehaviours: []
|
||||
_networkBehaviours:
|
||||
- {fileID: 2123363971034243866}
|
||||
<SerializedRootNetworkBehaviour>k__BackingField: {fileID: 0}
|
||||
<NestedRootNetworkBehaviours>k__BackingField: []
|
||||
SerializedTransformProperties:
|
||||
|
|
@ -207,7 +208,7 @@ MonoBehaviour:
|
|||
_spectatorInterpolation: 2
|
||||
_enableTeleport: 0
|
||||
_teleportThreshold: 1
|
||||
<PrefabId>k__BackingField: 0
|
||||
<PrefabId>k__BackingField: 5
|
||||
<SpawnableCollectionId>k__BackingField: 0
|
||||
<SceneId>k__BackingField: 0
|
||||
<AssetPathHash>k__BackingField: 3256920800479850326
|
||||
|
|
|
|||
|
|
@ -221,7 +221,7 @@ MonoBehaviour:
|
|||
m_EditorClassIdentifier:
|
||||
_componentIndexCache: 0
|
||||
_addedNetworkObject: {fileID: 960038795954186735}
|
||||
_networkObjectCache: {fileID: 0}
|
||||
_networkObjectCache: {fileID: 960038795954186735}
|
||||
spriteRenderer: {fileID: 2812699856257859066}
|
||||
isOpen: 0
|
||||
--- !u!95 &8796018902127597086
|
||||
|
|
@ -260,7 +260,8 @@ MonoBehaviour:
|
|||
<IsNested>k__BackingField: 0
|
||||
<ComponentIndex>k__BackingField: 0
|
||||
<PredictedSpawn>k__BackingField: {fileID: 0}
|
||||
_networkBehaviours: []
|
||||
_networkBehaviours:
|
||||
- {fileID: 7760105532892272102}
|
||||
<SerializedRootNetworkBehaviour>k__BackingField: {fileID: 0}
|
||||
<NestedRootNetworkBehaviours>k__BackingField: []
|
||||
SerializedTransformProperties:
|
||||
|
|
@ -286,7 +287,7 @@ MonoBehaviour:
|
|||
_spectatorInterpolation: 2
|
||||
_enableTeleport: 0
|
||||
_teleportThreshold: 1
|
||||
<PrefabId>k__BackingField: 0
|
||||
<PrefabId>k__BackingField: 12
|
||||
<SpawnableCollectionId>k__BackingField: 0
|
||||
<SceneId>k__BackingField: 0
|
||||
<AssetPathHash>k__BackingField: 8061167433109336374
|
||||
|
|
|
|||
|
|
@ -221,7 +221,7 @@ MonoBehaviour:
|
|||
m_EditorClassIdentifier:
|
||||
_componentIndexCache: 0
|
||||
_addedNetworkObject: {fileID: 6446530165902268640}
|
||||
_networkObjectCache: {fileID: 0}
|
||||
_networkObjectCache: {fileID: 6446530165902268640}
|
||||
spriteRenderer: {fileID: 2310845378874006054}
|
||||
isOpen: 0
|
||||
--- !u!95 &5432804531541599610
|
||||
|
|
@ -260,7 +260,8 @@ MonoBehaviour:
|
|||
<IsNested>k__BackingField: 0
|
||||
<ComponentIndex>k__BackingField: 0
|
||||
<PredictedSpawn>k__BackingField: {fileID: 0}
|
||||
_networkBehaviours: []
|
||||
_networkBehaviours:
|
||||
- {fileID: 4243905851245355992}
|
||||
<SerializedRootNetworkBehaviour>k__BackingField: {fileID: 0}
|
||||
<NestedRootNetworkBehaviours>k__BackingField: []
|
||||
SerializedTransformProperties:
|
||||
|
|
@ -286,7 +287,7 @@ MonoBehaviour:
|
|||
_spectatorInterpolation: 2
|
||||
_enableTeleport: 0
|
||||
_teleportThreshold: 1
|
||||
<PrefabId>k__BackingField: 0
|
||||
<PrefabId>k__BackingField: 13
|
||||
<SpawnableCollectionId>k__BackingField: 0
|
||||
<SceneId>k__BackingField: 0
|
||||
<AssetPathHash>k__BackingField: 14255186216443063978
|
||||
|
|
|
|||
|
|
@ -221,7 +221,7 @@ MonoBehaviour:
|
|||
m_EditorClassIdentifier:
|
||||
_componentIndexCache: 0
|
||||
_addedNetworkObject: {fileID: -3616648114084473137}
|
||||
_networkObjectCache: {fileID: 0}
|
||||
_networkObjectCache: {fileID: -3616648114084473137}
|
||||
spriteRenderer: {fileID: 5528728497644794172}
|
||||
isOpen: 0
|
||||
--- !u!95 &8709252973618295098
|
||||
|
|
@ -260,7 +260,8 @@ MonoBehaviour:
|
|||
<IsNested>k__BackingField: 0
|
||||
<ComponentIndex>k__BackingField: 0
|
||||
<PredictedSpawn>k__BackingField: {fileID: 0}
|
||||
_networkBehaviours: []
|
||||
_networkBehaviours:
|
||||
- {fileID: 9158841390873686060}
|
||||
<SerializedRootNetworkBehaviour>k__BackingField: {fileID: 0}
|
||||
<NestedRootNetworkBehaviours>k__BackingField: []
|
||||
SerializedTransformProperties:
|
||||
|
|
@ -286,7 +287,7 @@ MonoBehaviour:
|
|||
_spectatorInterpolation: 2
|
||||
_enableTeleport: 0
|
||||
_teleportThreshold: 1
|
||||
<PrefabId>k__BackingField: 0
|
||||
<PrefabId>k__BackingField: 14
|
||||
<SpawnableCollectionId>k__BackingField: 0
|
||||
<SceneId>k__BackingField: 0
|
||||
<AssetPathHash>k__BackingField: 5335259227794395190
|
||||
|
|
|
|||
|
|
@ -221,7 +221,7 @@ MonoBehaviour:
|
|||
m_EditorClassIdentifier:
|
||||
_componentIndexCache: 0
|
||||
_addedNetworkObject: {fileID: -2822219780314917497}
|
||||
_networkObjectCache: {fileID: 0}
|
||||
_networkObjectCache: {fileID: -2822219780314917497}
|
||||
spriteRenderer: {fileID: 3835355254939556028}
|
||||
isOpen: 0
|
||||
--- !u!95 &8781736509351607498
|
||||
|
|
@ -260,7 +260,8 @@ MonoBehaviour:
|
|||
<IsNested>k__BackingField: 0
|
||||
<ComponentIndex>k__BackingField: 0
|
||||
<PredictedSpawn>k__BackingField: {fileID: 0}
|
||||
_networkBehaviours: []
|
||||
_networkBehaviours:
|
||||
- {fileID: 3204602836052373403}
|
||||
<SerializedRootNetworkBehaviour>k__BackingField: {fileID: 0}
|
||||
<NestedRootNetworkBehaviours>k__BackingField: []
|
||||
SerializedTransformProperties:
|
||||
|
|
@ -286,7 +287,7 @@ MonoBehaviour:
|
|||
_spectatorInterpolation: 2
|
||||
_enableTeleport: 0
|
||||
_teleportThreshold: 1
|
||||
<PrefabId>k__BackingField: 0
|
||||
<PrefabId>k__BackingField: 15
|
||||
<SpawnableCollectionId>k__BackingField: 0
|
||||
<SceneId>k__BackingField: 0
|
||||
<AssetPathHash>k__BackingField: 9577290460660868732
|
||||
|
|
|
|||
|
|
@ -221,7 +221,7 @@ MonoBehaviour:
|
|||
m_EditorClassIdentifier:
|
||||
_componentIndexCache: 0
|
||||
_addedNetworkObject: {fileID: -8366173737003584427}
|
||||
_networkObjectCache: {fileID: 0}
|
||||
_networkObjectCache: {fileID: -8366173737003584427}
|
||||
spriteRenderer: {fileID: 3697232937654122685}
|
||||
isOpen: 0
|
||||
--- !u!95 &2551984011919125539
|
||||
|
|
@ -260,7 +260,8 @@ MonoBehaviour:
|
|||
<IsNested>k__BackingField: 0
|
||||
<ComponentIndex>k__BackingField: 0
|
||||
<PredictedSpawn>k__BackingField: {fileID: 0}
|
||||
_networkBehaviours: []
|
||||
_networkBehaviours:
|
||||
- {fileID: 4761609072167350656}
|
||||
<SerializedRootNetworkBehaviour>k__BackingField: {fileID: 0}
|
||||
<NestedRootNetworkBehaviours>k__BackingField: []
|
||||
SerializedTransformProperties:
|
||||
|
|
@ -286,7 +287,7 @@ MonoBehaviour:
|
|||
_spectatorInterpolation: 2
|
||||
_enableTeleport: 0
|
||||
_teleportThreshold: 1
|
||||
<PrefabId>k__BackingField: 0
|
||||
<PrefabId>k__BackingField: 16
|
||||
<SpawnableCollectionId>k__BackingField: 0
|
||||
<SceneId>k__BackingField: 0
|
||||
<AssetPathHash>k__BackingField: 5991937555389734354
|
||||
|
|
|
|||
|
|
@ -221,7 +221,7 @@ MonoBehaviour:
|
|||
m_EditorClassIdentifier:
|
||||
_componentIndexCache: 0
|
||||
_addedNetworkObject: {fileID: 2636165401579169696}
|
||||
_networkObjectCache: {fileID: 0}
|
||||
_networkObjectCache: {fileID: 2636165401579169696}
|
||||
spriteRenderer: {fileID: 5334825130246477694}
|
||||
isOpen: 0
|
||||
--- !u!95 &3450081476645676699
|
||||
|
|
@ -260,7 +260,8 @@ MonoBehaviour:
|
|||
<IsNested>k__BackingField: 0
|
||||
<ComponentIndex>k__BackingField: 0
|
||||
<PredictedSpawn>k__BackingField: {fileID: 0}
|
||||
_networkBehaviours: []
|
||||
_networkBehaviours:
|
||||
- {fileID: 6083298626510929632}
|
||||
<SerializedRootNetworkBehaviour>k__BackingField: {fileID: 0}
|
||||
<NestedRootNetworkBehaviours>k__BackingField: []
|
||||
SerializedTransformProperties:
|
||||
|
|
@ -286,7 +287,7 @@ MonoBehaviour:
|
|||
_spectatorInterpolation: 2
|
||||
_enableTeleport: 0
|
||||
_teleportThreshold: 1
|
||||
<PrefabId>k__BackingField: 0
|
||||
<PrefabId>k__BackingField: 17
|
||||
<SpawnableCollectionId>k__BackingField: 0
|
||||
<SceneId>k__BackingField: 0
|
||||
<AssetPathHash>k__BackingField: 12438406022414474038
|
||||
|
|
|
|||
|
|
@ -221,7 +221,7 @@ MonoBehaviour:
|
|||
m_EditorClassIdentifier:
|
||||
_componentIndexCache: 0
|
||||
_addedNetworkObject: {fileID: 6864996696300648344}
|
||||
_networkObjectCache: {fileID: 0}
|
||||
_networkObjectCache: {fileID: 6864996696300648344}
|
||||
spriteRenderer: {fileID: 435303517270671085}
|
||||
isOpen: 0
|
||||
--- !u!95 &4038669226369983503
|
||||
|
|
@ -260,7 +260,8 @@ MonoBehaviour:
|
|||
<IsNested>k__BackingField: 0
|
||||
<ComponentIndex>k__BackingField: 0
|
||||
<PredictedSpawn>k__BackingField: {fileID: 0}
|
||||
_networkBehaviours: []
|
||||
_networkBehaviours:
|
||||
- {fileID: 7468142295846554512}
|
||||
<SerializedRootNetworkBehaviour>k__BackingField: {fileID: 0}
|
||||
<NestedRootNetworkBehaviours>k__BackingField: []
|
||||
SerializedTransformProperties:
|
||||
|
|
@ -286,7 +287,7 @@ MonoBehaviour:
|
|||
_spectatorInterpolation: 2
|
||||
_enableTeleport: 0
|
||||
_teleportThreshold: 1
|
||||
<PrefabId>k__BackingField: 0
|
||||
<PrefabId>k__BackingField: 18
|
||||
<SpawnableCollectionId>k__BackingField: 0
|
||||
<SceneId>k__BackingField: 0
|
||||
<AssetPathHash>k__BackingField: 13066506984730913578
|
||||
|
|
|
|||
|
|
@ -207,7 +207,7 @@ MonoBehaviour:
|
|||
m_EditorClassIdentifier:
|
||||
_componentIndexCache: 0
|
||||
_addedNetworkObject: {fileID: 6204830877651421303}
|
||||
_networkObjectCache: {fileID: 0}
|
||||
_networkObjectCache: {fileID: 6204830877651421303}
|
||||
spriteRenderer: {fileID: 7569659958949472843}
|
||||
isWatered: 0
|
||||
interactable: {fileID: 11400000, guid: 76826a27ad1f3184091fb18dd75495f4, type: 2}
|
||||
|
|
@ -227,7 +227,8 @@ MonoBehaviour:
|
|||
<IsNested>k__BackingField: 0
|
||||
<ComponentIndex>k__BackingField: 0
|
||||
<PredictedSpawn>k__BackingField: {fileID: 0}
|
||||
_networkBehaviours: []
|
||||
_networkBehaviours:
|
||||
- {fileID: 5110065896684366382}
|
||||
<SerializedRootNetworkBehaviour>k__BackingField: {fileID: 0}
|
||||
<NestedRootNetworkBehaviours>k__BackingField: []
|
||||
SerializedTransformProperties:
|
||||
|
|
@ -253,7 +254,7 @@ MonoBehaviour:
|
|||
_spectatorInterpolation: 2
|
||||
_enableTeleport: 0
|
||||
_teleportThreshold: 1
|
||||
<PrefabId>k__BackingField: 0
|
||||
<PrefabId>k__BackingField: 19
|
||||
<SpawnableCollectionId>k__BackingField: 0
|
||||
<SceneId>k__BackingField: 0
|
||||
<AssetPathHash>k__BackingField: 5552474011273272656
|
||||
|
|
|
|||
|
|
@ -207,7 +207,7 @@ MonoBehaviour:
|
|||
m_EditorClassIdentifier:
|
||||
_componentIndexCache: 0
|
||||
_addedNetworkObject: {fileID: 8054744169198205596}
|
||||
_networkObjectCache: {fileID: 0}
|
||||
_networkObjectCache: {fileID: 8054744169198205596}
|
||||
spriteRenderer: {fileID: 4535042709185940493}
|
||||
isWatered: 0
|
||||
interactable: {fileID: 11400000, guid: 9d3f6b07ebb095948ba149b02146bfb5, type: 2}
|
||||
|
|
@ -227,7 +227,8 @@ MonoBehaviour:
|
|||
<IsNested>k__BackingField: 0
|
||||
<ComponentIndex>k__BackingField: 0
|
||||
<PredictedSpawn>k__BackingField: {fileID: 0}
|
||||
_networkBehaviours: []
|
||||
_networkBehaviours:
|
||||
- {fileID: 459632744151183343}
|
||||
<SerializedRootNetworkBehaviour>k__BackingField: {fileID: 0}
|
||||
<NestedRootNetworkBehaviours>k__BackingField: []
|
||||
SerializedTransformProperties:
|
||||
|
|
@ -253,7 +254,7 @@ MonoBehaviour:
|
|||
_spectatorInterpolation: 2
|
||||
_enableTeleport: 0
|
||||
_teleportThreshold: 1
|
||||
<PrefabId>k__BackingField: 0
|
||||
<PrefabId>k__BackingField: 20
|
||||
<SpawnableCollectionId>k__BackingField: 0
|
||||
<SceneId>k__BackingField: 0
|
||||
<AssetPathHash>k__BackingField: 11594984528968966088
|
||||
|
|
|
|||
|
|
@ -207,7 +207,7 @@ MonoBehaviour:
|
|||
m_EditorClassIdentifier:
|
||||
_componentIndexCache: 0
|
||||
_addedNetworkObject: {fileID: 3469224167990498062}
|
||||
_networkObjectCache: {fileID: 0}
|
||||
_networkObjectCache: {fileID: 3469224167990498062}
|
||||
spriteRenderer: {fileID: 559133922847634622}
|
||||
isWatered: 0
|
||||
interactable: {fileID: 11400000, guid: 93f26844ef39b0d4ea924227f4625a13, type: 2}
|
||||
|
|
@ -227,7 +227,8 @@ MonoBehaviour:
|
|||
<IsNested>k__BackingField: 0
|
||||
<ComponentIndex>k__BackingField: 0
|
||||
<PredictedSpawn>k__BackingField: {fileID: 0}
|
||||
_networkBehaviours: []
|
||||
_networkBehaviours:
|
||||
- {fileID: 1895192436138919823}
|
||||
<SerializedRootNetworkBehaviour>k__BackingField: {fileID: 0}
|
||||
<NestedRootNetworkBehaviours>k__BackingField: []
|
||||
SerializedTransformProperties:
|
||||
|
|
@ -253,7 +254,7 @@ MonoBehaviour:
|
|||
_spectatorInterpolation: 2
|
||||
_enableTeleport: 0
|
||||
_teleportThreshold: 1
|
||||
<PrefabId>k__BackingField: 0
|
||||
<PrefabId>k__BackingField: 21
|
||||
<SpawnableCollectionId>k__BackingField: 0
|
||||
<SceneId>k__BackingField: 0
|
||||
<AssetPathHash>k__BackingField: 3738623644471809202
|
||||
|
|
|
|||
|
|
@ -207,7 +207,7 @@ MonoBehaviour:
|
|||
m_EditorClassIdentifier:
|
||||
_componentIndexCache: 0
|
||||
_addedNetworkObject: {fileID: -3290984483482744629}
|
||||
_networkObjectCache: {fileID: 0}
|
||||
_networkObjectCache: {fileID: -3290984483482744629}
|
||||
spriteRenderer: {fileID: 5918492356921558124}
|
||||
isWatered: 0
|
||||
interactable: {fileID: 11400000, guid: 26b3b7aeddb33354685b9d9e694071ce, type: 2}
|
||||
|
|
@ -227,7 +227,8 @@ MonoBehaviour:
|
|||
<IsNested>k__BackingField: 0
|
||||
<ComponentIndex>k__BackingField: 0
|
||||
<PredictedSpawn>k__BackingField: {fileID: 0}
|
||||
_networkBehaviours: []
|
||||
_networkBehaviours:
|
||||
- {fileID: -6019656548087975441}
|
||||
<SerializedRootNetworkBehaviour>k__BackingField: {fileID: 0}
|
||||
<NestedRootNetworkBehaviours>k__BackingField: []
|
||||
SerializedTransformProperties:
|
||||
|
|
@ -253,7 +254,7 @@ MonoBehaviour:
|
|||
_spectatorInterpolation: 2
|
||||
_enableTeleport: 0
|
||||
_teleportThreshold: 1
|
||||
<PrefabId>k__BackingField: 0
|
||||
<PrefabId>k__BackingField: 22
|
||||
<SpawnableCollectionId>k__BackingField: 0
|
||||
<SceneId>k__BackingField: 0
|
||||
<AssetPathHash>k__BackingField: 16852626372104524030
|
||||
|
|
|
|||
|
|
@ -207,7 +207,7 @@ MonoBehaviour:
|
|||
m_EditorClassIdentifier:
|
||||
_componentIndexCache: 0
|
||||
_addedNetworkObject: {fileID: -1980267921705951265}
|
||||
_networkObjectCache: {fileID: 0}
|
||||
_networkObjectCache: {fileID: -1980267921705951265}
|
||||
spriteRenderer: {fileID: 4986771310947873930}
|
||||
isWatered: 0
|
||||
interactable: {fileID: 11400000, guid: a7e69c23b34173b4585d833469034cd0, type: 2}
|
||||
|
|
@ -227,7 +227,8 @@ MonoBehaviour:
|
|||
<IsNested>k__BackingField: 0
|
||||
<ComponentIndex>k__BackingField: 0
|
||||
<PredictedSpawn>k__BackingField: {fileID: 0}
|
||||
_networkBehaviours: []
|
||||
_networkBehaviours:
|
||||
- {fileID: 4223285575699791215}
|
||||
<SerializedRootNetworkBehaviour>k__BackingField: {fileID: 0}
|
||||
<NestedRootNetworkBehaviours>k__BackingField: []
|
||||
SerializedTransformProperties:
|
||||
|
|
@ -253,7 +254,7 @@ MonoBehaviour:
|
|||
_spectatorInterpolation: 2
|
||||
_enableTeleport: 0
|
||||
_teleportThreshold: 1
|
||||
<PrefabId>k__BackingField: 0
|
||||
<PrefabId>k__BackingField: 23
|
||||
<SpawnableCollectionId>k__BackingField: 0
|
||||
<SceneId>k__BackingField: 0
|
||||
<AssetPathHash>k__BackingField: 2225417808457850878
|
||||
|
|
|
|||
|
|
@ -220,7 +220,7 @@ MonoBehaviour:
|
|||
m_EditorClassIdentifier:
|
||||
_componentIndexCache: 0
|
||||
_addedNetworkObject: {fileID: -7083585525248896382}
|
||||
_networkObjectCache: {fileID: 0}
|
||||
_networkObjectCache: {fileID: -7083585525248896382}
|
||||
spriteRenderer: {fileID: 3892734261933799628}
|
||||
isWatered: 0
|
||||
interactable: {fileID: 11400000, guid: 7f26cbf5837010c4faa4e6241871e116, type: 2}
|
||||
|
|
@ -240,7 +240,8 @@ MonoBehaviour:
|
|||
<IsNested>k__BackingField: 0
|
||||
<ComponentIndex>k__BackingField: 0
|
||||
<PredictedSpawn>k__BackingField: {fileID: 0}
|
||||
_networkBehaviours: []
|
||||
_networkBehaviours:
|
||||
- {fileID: 7687821959021318013}
|
||||
<SerializedRootNetworkBehaviour>k__BackingField: {fileID: 0}
|
||||
<NestedRootNetworkBehaviours>k__BackingField: []
|
||||
SerializedTransformProperties:
|
||||
|
|
@ -266,7 +267,7 @@ MonoBehaviour:
|
|||
_spectatorInterpolation: 2
|
||||
_enableTeleport: 0
|
||||
_teleportThreshold: 1
|
||||
<PrefabId>k__BackingField: 0
|
||||
<PrefabId>k__BackingField: 24
|
||||
<SpawnableCollectionId>k__BackingField: 0
|
||||
<SceneId>k__BackingField: 0
|
||||
<AssetPathHash>k__BackingField: 16850273477667702236
|
||||
|
|
|
|||
|
|
@ -207,7 +207,7 @@ MonoBehaviour:
|
|||
m_EditorClassIdentifier:
|
||||
_componentIndexCache: 0
|
||||
_addedNetworkObject: {fileID: -6384908273091658543}
|
||||
_networkObjectCache: {fileID: 0}
|
||||
_networkObjectCache: {fileID: -6384908273091658543}
|
||||
spriteRenderer: {fileID: 2427780194368093024}
|
||||
isWatered: 0
|
||||
interactable: {fileID: 11400000, guid: 3e11c72926e6b2c468cd049adafa26a7, type: 2}
|
||||
|
|
@ -227,7 +227,8 @@ MonoBehaviour:
|
|||
<IsNested>k__BackingField: 0
|
||||
<ComponentIndex>k__BackingField: 0
|
||||
<PredictedSpawn>k__BackingField: {fileID: 0}
|
||||
_networkBehaviours: []
|
||||
_networkBehaviours:
|
||||
- {fileID: -7587471339032506065}
|
||||
<SerializedRootNetworkBehaviour>k__BackingField: {fileID: 0}
|
||||
<NestedRootNetworkBehaviours>k__BackingField: []
|
||||
SerializedTransformProperties:
|
||||
|
|
@ -253,7 +254,7 @@ MonoBehaviour:
|
|||
_spectatorInterpolation: 2
|
||||
_enableTeleport: 0
|
||||
_teleportThreshold: 1
|
||||
<PrefabId>k__BackingField: 0
|
||||
<PrefabId>k__BackingField: 25
|
||||
<SpawnableCollectionId>k__BackingField: 0
|
||||
<SceneId>k__BackingField: 0
|
||||
<AssetPathHash>k__BackingField: 11998666767505708628
|
||||
|
|
|
|||
|
|
@ -207,7 +207,7 @@ MonoBehaviour:
|
|||
m_EditorClassIdentifier:
|
||||
_componentIndexCache: 0
|
||||
_addedNetworkObject: {fileID: -2972796654032770097}
|
||||
_networkObjectCache: {fileID: 0}
|
||||
_networkObjectCache: {fileID: -2972796654032770097}
|
||||
spriteRenderer: {fileID: 1408470667953940440}
|
||||
isWatered: 0
|
||||
interactable: {fileID: 11400000, guid: 3e11c72926e6b2c468cd049adafa26a7, type: 2}
|
||||
|
|
@ -227,7 +227,8 @@ MonoBehaviour:
|
|||
<IsNested>k__BackingField: 0
|
||||
<ComponentIndex>k__BackingField: 0
|
||||
<PredictedSpawn>k__BackingField: {fileID: 0}
|
||||
_networkBehaviours: []
|
||||
_networkBehaviours:
|
||||
- {fileID: 6157543948379502122}
|
||||
<SerializedRootNetworkBehaviour>k__BackingField: {fileID: 0}
|
||||
<NestedRootNetworkBehaviours>k__BackingField: []
|
||||
SerializedTransformProperties:
|
||||
|
|
@ -253,7 +254,7 @@ MonoBehaviour:
|
|||
_spectatorInterpolation: 2
|
||||
_enableTeleport: 0
|
||||
_teleportThreshold: 1
|
||||
<PrefabId>k__BackingField: 0
|
||||
<PrefabId>k__BackingField: 26
|
||||
<SpawnableCollectionId>k__BackingField: 0
|
||||
<SceneId>k__BackingField: 0
|
||||
<AssetPathHash>k__BackingField: 3603598302728994896
|
||||
|
|
|
|||
|
|
@ -207,7 +207,7 @@ MonoBehaviour:
|
|||
m_EditorClassIdentifier:
|
||||
_componentIndexCache: 0
|
||||
_addedNetworkObject: {fileID: 7510286910302065789}
|
||||
_networkObjectCache: {fileID: 0}
|
||||
_networkObjectCache: {fileID: 7510286910302065789}
|
||||
spriteRenderer: {fileID: 3232235958491628908}
|
||||
isWatered: 0
|
||||
interactable: {fileID: 11400000, guid: bd045b57b252e114fa5e8ee9fc2ae4ef, type: 2}
|
||||
|
|
@ -227,7 +227,8 @@ MonoBehaviour:
|
|||
<IsNested>k__BackingField: 0
|
||||
<ComponentIndex>k__BackingField: 0
|
||||
<PredictedSpawn>k__BackingField: {fileID: 0}
|
||||
_networkBehaviours: []
|
||||
_networkBehaviours:
|
||||
- {fileID: 218523427399751967}
|
||||
<SerializedRootNetworkBehaviour>k__BackingField: {fileID: 0}
|
||||
<NestedRootNetworkBehaviours>k__BackingField: []
|
||||
SerializedTransformProperties:
|
||||
|
|
@ -253,7 +254,7 @@ MonoBehaviour:
|
|||
_spectatorInterpolation: 2
|
||||
_enableTeleport: 0
|
||||
_teleportThreshold: 1
|
||||
<PrefabId>k__BackingField: 0
|
||||
<PrefabId>k__BackingField: 27
|
||||
<SpawnableCollectionId>k__BackingField: 0
|
||||
<SceneId>k__BackingField: 0
|
||||
<AssetPathHash>k__BackingField: 16654999654494181344
|
||||
|
|
|
|||
|
|
@ -207,7 +207,7 @@ MonoBehaviour:
|
|||
m_EditorClassIdentifier:
|
||||
_componentIndexCache: 0
|
||||
_addedNetworkObject: {fileID: 3751744365188801268}
|
||||
_networkObjectCache: {fileID: 0}
|
||||
_networkObjectCache: {fileID: 3751744365188801268}
|
||||
spriteRenderer: {fileID: 1292128480205837717}
|
||||
isWatered: 0
|
||||
interactable: {fileID: 11400000, guid: 7adea2f512d9c144fb3072bf2430e6c7, type: 2}
|
||||
|
|
@ -227,7 +227,8 @@ MonoBehaviour:
|
|||
<IsNested>k__BackingField: 0
|
||||
<ComponentIndex>k__BackingField: 0
|
||||
<PredictedSpawn>k__BackingField: {fileID: 0}
|
||||
_networkBehaviours: []
|
||||
_networkBehaviours:
|
||||
- {fileID: 67264825166641080}
|
||||
<SerializedRootNetworkBehaviour>k__BackingField: {fileID: 0}
|
||||
<NestedRootNetworkBehaviours>k__BackingField: []
|
||||
SerializedTransformProperties:
|
||||
|
|
@ -253,7 +254,7 @@ MonoBehaviour:
|
|||
_spectatorInterpolation: 2
|
||||
_enableTeleport: 0
|
||||
_teleportThreshold: 1
|
||||
<PrefabId>k__BackingField: 0
|
||||
<PrefabId>k__BackingField: 28
|
||||
<SpawnableCollectionId>k__BackingField: 0
|
||||
<SceneId>k__BackingField: 0
|
||||
<AssetPathHash>k__BackingField: 7918749461749849100
|
||||
|
|
|
|||
|
|
@ -207,7 +207,7 @@ MonoBehaviour:
|
|||
m_EditorClassIdentifier:
|
||||
_componentIndexCache: 0
|
||||
_addedNetworkObject: {fileID: -580013974325937750}
|
||||
_networkObjectCache: {fileID: 0}
|
||||
_networkObjectCache: {fileID: -580013974325937750}
|
||||
spriteRenderer: {fileID: 1072517562131914173}
|
||||
isWatered: 0
|
||||
interactable: {fileID: 11400000, guid: f7868dd9137f69b44975ed84d4e385ae, type: 2}
|
||||
|
|
@ -227,7 +227,8 @@ MonoBehaviour:
|
|||
<IsNested>k__BackingField: 0
|
||||
<ComponentIndex>k__BackingField: 0
|
||||
<PredictedSpawn>k__BackingField: {fileID: 0}
|
||||
_networkBehaviours: []
|
||||
_networkBehaviours:
|
||||
- {fileID: -6724120058115984502}
|
||||
<SerializedRootNetworkBehaviour>k__BackingField: {fileID: 0}
|
||||
<NestedRootNetworkBehaviours>k__BackingField: []
|
||||
SerializedTransformProperties:
|
||||
|
|
@ -253,7 +254,7 @@ MonoBehaviour:
|
|||
_spectatorInterpolation: 2
|
||||
_enableTeleport: 0
|
||||
_teleportThreshold: 1
|
||||
<PrefabId>k__BackingField: 0
|
||||
<PrefabId>k__BackingField: 29
|
||||
<SpawnableCollectionId>k__BackingField: 0
|
||||
<SceneId>k__BackingField: 0
|
||||
<AssetPathHash>k__BackingField: 8633419705052674244
|
||||
|
|
|
|||
|
|
@ -207,7 +207,7 @@ MonoBehaviour:
|
|||
m_EditorClassIdentifier:
|
||||
_componentIndexCache: 0
|
||||
_addedNetworkObject: {fileID: 695218077827156125}
|
||||
_networkObjectCache: {fileID: 0}
|
||||
_networkObjectCache: {fileID: 695218077827156125}
|
||||
spriteRenderer: {fileID: 2738391265878291754}
|
||||
isWatered: 0
|
||||
interactable: {fileID: 11400000, guid: ea96d8851da869543ac8e719dd44ba98, type: 2}
|
||||
|
|
@ -227,7 +227,8 @@ MonoBehaviour:
|
|||
<IsNested>k__BackingField: 0
|
||||
<ComponentIndex>k__BackingField: 0
|
||||
<PredictedSpawn>k__BackingField: {fileID: 0}
|
||||
_networkBehaviours: []
|
||||
_networkBehaviours:
|
||||
- {fileID: 5424930917940983276}
|
||||
<SerializedRootNetworkBehaviour>k__BackingField: {fileID: 0}
|
||||
<NestedRootNetworkBehaviours>k__BackingField: []
|
||||
SerializedTransformProperties:
|
||||
|
|
@ -253,7 +254,7 @@ MonoBehaviour:
|
|||
_spectatorInterpolation: 2
|
||||
_enableTeleport: 0
|
||||
_teleportThreshold: 1
|
||||
<PrefabId>k__BackingField: 0
|
||||
<PrefabId>k__BackingField: 30
|
||||
<SpawnableCollectionId>k__BackingField: 0
|
||||
<SceneId>k__BackingField: 0
|
||||
<AssetPathHash>k__BackingField: 13640264520331052540
|
||||
|
|
|
|||
|
|
@ -207,7 +207,7 @@ MonoBehaviour:
|
|||
m_EditorClassIdentifier:
|
||||
_componentIndexCache: 0
|
||||
_addedNetworkObject: {fileID: 4990843602345498263}
|
||||
_networkObjectCache: {fileID: 0}
|
||||
_networkObjectCache: {fileID: 4990843602345498263}
|
||||
spriteRenderer: {fileID: 7797022057756023329}
|
||||
isWatered: 0
|
||||
interactable: {fileID: 11400000, guid: f23bb255938cefa4a80bf50db1132f0d, type: 2}
|
||||
|
|
@ -227,7 +227,8 @@ MonoBehaviour:
|
|||
<IsNested>k__BackingField: 0
|
||||
<ComponentIndex>k__BackingField: 0
|
||||
<PredictedSpawn>k__BackingField: {fileID: 0}
|
||||
_networkBehaviours: []
|
||||
_networkBehaviours:
|
||||
- {fileID: 8611451050922701094}
|
||||
<SerializedRootNetworkBehaviour>k__BackingField: {fileID: 0}
|
||||
<NestedRootNetworkBehaviours>k__BackingField: []
|
||||
SerializedTransformProperties:
|
||||
|
|
@ -253,7 +254,7 @@ MonoBehaviour:
|
|||
_spectatorInterpolation: 2
|
||||
_enableTeleport: 0
|
||||
_teleportThreshold: 1
|
||||
<PrefabId>k__BackingField: 0
|
||||
<PrefabId>k__BackingField: 31
|
||||
<SpawnableCollectionId>k__BackingField: 0
|
||||
<SceneId>k__BackingField: 0
|
||||
<AssetPathHash>k__BackingField: 6402881015698984174
|
||||
|
|
|
|||
|
|
@ -207,7 +207,7 @@ MonoBehaviour:
|
|||
m_EditorClassIdentifier:
|
||||
_componentIndexCache: 0
|
||||
_addedNetworkObject: {fileID: -3739330565798106166}
|
||||
_networkObjectCache: {fileID: 0}
|
||||
_networkObjectCache: {fileID: -3739330565798106166}
|
||||
spriteRenderer: {fileID: 4626688896833709220}
|
||||
isWatered: 0
|
||||
interactable: {fileID: 11400000, guid: 4887217108834c146b6c5ebd6d28989c, type: 2}
|
||||
|
|
@ -227,7 +227,8 @@ MonoBehaviour:
|
|||
<IsNested>k__BackingField: 0
|
||||
<ComponentIndex>k__BackingField: 0
|
||||
<PredictedSpawn>k__BackingField: {fileID: 0}
|
||||
_networkBehaviours: []
|
||||
_networkBehaviours:
|
||||
- {fileID: -7126831946217866775}
|
||||
<SerializedRootNetworkBehaviour>k__BackingField: {fileID: 0}
|
||||
<NestedRootNetworkBehaviours>k__BackingField: []
|
||||
SerializedTransformProperties:
|
||||
|
|
@ -253,7 +254,7 @@ MonoBehaviour:
|
|||
_spectatorInterpolation: 2
|
||||
_enableTeleport: 0
|
||||
_teleportThreshold: 1
|
||||
<PrefabId>k__BackingField: 0
|
||||
<PrefabId>k__BackingField: 32
|
||||
<SpawnableCollectionId>k__BackingField: 0
|
||||
<SceneId>k__BackingField: 0
|
||||
<AssetPathHash>k__BackingField: 5149245319583275086
|
||||
|
|
|
|||
|
|
@ -207,7 +207,7 @@ MonoBehaviour:
|
|||
m_EditorClassIdentifier:
|
||||
_componentIndexCache: 0
|
||||
_addedNetworkObject: {fileID: -5496347672960475734}
|
||||
_networkObjectCache: {fileID: 0}
|
||||
_networkObjectCache: {fileID: -5496347672960475734}
|
||||
spriteRenderer: {fileID: 4859211080195019468}
|
||||
isWatered: 0
|
||||
interactable: {fileID: 11400000, guid: 751526047a0f8a64f94f5c826c962b57, type: 2}
|
||||
|
|
@ -227,7 +227,8 @@ MonoBehaviour:
|
|||
<IsNested>k__BackingField: 0
|
||||
<ComponentIndex>k__BackingField: 0
|
||||
<PredictedSpawn>k__BackingField: {fileID: 0}
|
||||
_networkBehaviours: []
|
||||
_networkBehaviours:
|
||||
- {fileID: 3310018754684497017}
|
||||
<SerializedRootNetworkBehaviour>k__BackingField: {fileID: 0}
|
||||
<NestedRootNetworkBehaviours>k__BackingField: []
|
||||
SerializedTransformProperties:
|
||||
|
|
@ -253,7 +254,7 @@ MonoBehaviour:
|
|||
_spectatorInterpolation: 2
|
||||
_enableTeleport: 0
|
||||
_teleportThreshold: 1
|
||||
<PrefabId>k__BackingField: 0
|
||||
<PrefabId>k__BackingField: 33
|
||||
<SpawnableCollectionId>k__BackingField: 0
|
||||
<SceneId>k__BackingField: 0
|
||||
<AssetPathHash>k__BackingField: 2376607496941366820
|
||||
|
|
|
|||
|
|
@ -207,7 +207,7 @@ MonoBehaviour:
|
|||
m_EditorClassIdentifier:
|
||||
_componentIndexCache: 0
|
||||
_addedNetworkObject: {fileID: -4785944454699635118}
|
||||
_networkObjectCache: {fileID: 0}
|
||||
_networkObjectCache: {fileID: -4785944454699635118}
|
||||
spriteRenderer: {fileID: 5327499426460652988}
|
||||
isWatered: 0
|
||||
interactable: {fileID: 11400000, guid: 7a8931dc5e523954fb71b685ddb24ebd, type: 2}
|
||||
|
|
@ -227,7 +227,8 @@ MonoBehaviour:
|
|||
<IsNested>k__BackingField: 0
|
||||
<ComponentIndex>k__BackingField: 0
|
||||
<PredictedSpawn>k__BackingField: {fileID: 0}
|
||||
_networkBehaviours: []
|
||||
_networkBehaviours:
|
||||
- {fileID: -4660105521197672102}
|
||||
<SerializedRootNetworkBehaviour>k__BackingField: {fileID: 0}
|
||||
<NestedRootNetworkBehaviours>k__BackingField: []
|
||||
SerializedTransformProperties:
|
||||
|
|
@ -253,7 +254,7 @@ MonoBehaviour:
|
|||
_spectatorInterpolation: 2
|
||||
_enableTeleport: 0
|
||||
_teleportThreshold: 1
|
||||
<PrefabId>k__BackingField: 0
|
||||
<PrefabId>k__BackingField: 34
|
||||
<SpawnableCollectionId>k__BackingField: 0
|
||||
<SceneId>k__BackingField: 0
|
||||
<AssetPathHash>k__BackingField: 16273816580870447480
|
||||
|
|
|
|||
|
|
@ -207,7 +207,7 @@ MonoBehaviour:
|
|||
m_EditorClassIdentifier:
|
||||
_componentIndexCache: 0
|
||||
_addedNetworkObject: {fileID: -429663868210164051}
|
||||
_networkObjectCache: {fileID: 0}
|
||||
_networkObjectCache: {fileID: -429663868210164051}
|
||||
spriteRenderer: {fileID: 6187883774209223531}
|
||||
isWatered: 0
|
||||
interactable: {fileID: 11400000, guid: 175470b0df357644b97ab35b1c438cc5, type: 2}
|
||||
|
|
@ -227,7 +227,8 @@ MonoBehaviour:
|
|||
<IsNested>k__BackingField: 0
|
||||
<ComponentIndex>k__BackingField: 0
|
||||
<PredictedSpawn>k__BackingField: {fileID: 0}
|
||||
_networkBehaviours: []
|
||||
_networkBehaviours:
|
||||
- {fileID: 8235990389509423407}
|
||||
<SerializedRootNetworkBehaviour>k__BackingField: {fileID: 0}
|
||||
<NestedRootNetworkBehaviours>k__BackingField: []
|
||||
SerializedTransformProperties:
|
||||
|
|
@ -253,7 +254,7 @@ MonoBehaviour:
|
|||
_spectatorInterpolation: 2
|
||||
_enableTeleport: 0
|
||||
_teleportThreshold: 1
|
||||
<PrefabId>k__BackingField: 0
|
||||
<PrefabId>k__BackingField: 35
|
||||
<SpawnableCollectionId>k__BackingField: 0
|
||||
<SceneId>k__BackingField: 0
|
||||
<AssetPathHash>k__BackingField: 13972769165209050234
|
||||
|
|
|
|||
|
|
@ -207,7 +207,7 @@ MonoBehaviour:
|
|||
m_EditorClassIdentifier:
|
||||
_componentIndexCache: 0
|
||||
_addedNetworkObject: {fileID: -2385328952959754067}
|
||||
_networkObjectCache: {fileID: 0}
|
||||
_networkObjectCache: {fileID: -2385328952959754067}
|
||||
spriteRenderer: {fileID: 1401474802921084013}
|
||||
isWatered: 0
|
||||
interactable: {fileID: 11400000, guid: bc09c9672958b5f4685cd4eaf16ae59c, type: 2}
|
||||
|
|
@ -227,7 +227,8 @@ MonoBehaviour:
|
|||
<IsNested>k__BackingField: 0
|
||||
<ComponentIndex>k__BackingField: 0
|
||||
<PredictedSpawn>k__BackingField: {fileID: 0}
|
||||
_networkBehaviours: []
|
||||
_networkBehaviours:
|
||||
- {fileID: -653848121709455755}
|
||||
<SerializedRootNetworkBehaviour>k__BackingField: {fileID: 0}
|
||||
<NestedRootNetworkBehaviours>k__BackingField: []
|
||||
SerializedTransformProperties:
|
||||
|
|
@ -253,7 +254,7 @@ MonoBehaviour:
|
|||
_spectatorInterpolation: 2
|
||||
_enableTeleport: 0
|
||||
_teleportThreshold: 1
|
||||
<PrefabId>k__BackingField: 0
|
||||
<PrefabId>k__BackingField: 36
|
||||
<SpawnableCollectionId>k__BackingField: 0
|
||||
<SceneId>k__BackingField: 0
|
||||
<AssetPathHash>k__BackingField: 13290965855321842104
|
||||
|
|
|
|||
|
|
@ -207,7 +207,7 @@ MonoBehaviour:
|
|||
m_EditorClassIdentifier:
|
||||
_componentIndexCache: 0
|
||||
_addedNetworkObject: {fileID: 4962757815481388645}
|
||||
_networkObjectCache: {fileID: 0}
|
||||
_networkObjectCache: {fileID: 4962757815481388645}
|
||||
spriteRenderer: {fileID: 2204399065352803664}
|
||||
isWatered: 0
|
||||
interactable: {fileID: 11400000, guid: bec090a8a637294448024f77822daf6f, type: 2}
|
||||
|
|
@ -227,7 +227,8 @@ MonoBehaviour:
|
|||
<IsNested>k__BackingField: 0
|
||||
<ComponentIndex>k__BackingField: 0
|
||||
<PredictedSpawn>k__BackingField: {fileID: 0}
|
||||
_networkBehaviours: []
|
||||
_networkBehaviours:
|
||||
- {fileID: -2603114006261408809}
|
||||
<SerializedRootNetworkBehaviour>k__BackingField: {fileID: 0}
|
||||
<NestedRootNetworkBehaviours>k__BackingField: []
|
||||
SerializedTransformProperties:
|
||||
|
|
@ -253,7 +254,7 @@ MonoBehaviour:
|
|||
_spectatorInterpolation: 2
|
||||
_enableTeleport: 0
|
||||
_teleportThreshold: 1
|
||||
<PrefabId>k__BackingField: 0
|
||||
<PrefabId>k__BackingField: 37
|
||||
<SpawnableCollectionId>k__BackingField: 0
|
||||
<SceneId>k__BackingField: 0
|
||||
<AssetPathHash>k__BackingField: 2778182282655434870
|
||||
|
|
|
|||
|
|
@ -207,7 +207,7 @@ MonoBehaviour:
|
|||
m_EditorClassIdentifier:
|
||||
_componentIndexCache: 0
|
||||
_addedNetworkObject: {fileID: -1612594746484104715}
|
||||
_networkObjectCache: {fileID: 0}
|
||||
_networkObjectCache: {fileID: -1612594746484104715}
|
||||
spriteRenderer: {fileID: 7864640857078091225}
|
||||
isWatered: 0
|
||||
interactable: {fileID: 11400000, guid: bec090a8a637294448024f77822daf6f, type: 2}
|
||||
|
|
@ -227,7 +227,8 @@ MonoBehaviour:
|
|||
<IsNested>k__BackingField: 0
|
||||
<ComponentIndex>k__BackingField: 0
|
||||
<PredictedSpawn>k__BackingField: {fileID: 0}
|
||||
_networkBehaviours: []
|
||||
_networkBehaviours:
|
||||
- {fileID: -6090327201400285667}
|
||||
<SerializedRootNetworkBehaviour>k__BackingField: {fileID: 0}
|
||||
<NestedRootNetworkBehaviours>k__BackingField: []
|
||||
SerializedTransformProperties:
|
||||
|
|
@ -253,7 +254,7 @@ MonoBehaviour:
|
|||
_spectatorInterpolation: 2
|
||||
_enableTeleport: 0
|
||||
_teleportThreshold: 1
|
||||
<PrefabId>k__BackingField: 0
|
||||
<PrefabId>k__BackingField: 38
|
||||
<SpawnableCollectionId>k__BackingField: 0
|
||||
<SceneId>k__BackingField: 0
|
||||
<AssetPathHash>k__BackingField: 2220884846918265528
|
||||
|
|
|
|||
|
|
@ -207,7 +207,7 @@ MonoBehaviour:
|
|||
m_EditorClassIdentifier:
|
||||
_componentIndexCache: 0
|
||||
_addedNetworkObject: {fileID: -6097145956325194350}
|
||||
_networkObjectCache: {fileID: 0}
|
||||
_networkObjectCache: {fileID: -6097145956325194350}
|
||||
spriteRenderer: {fileID: 2955524186940675720}
|
||||
isWatered: 0
|
||||
interactable: {fileID: 11400000, guid: 37e5113d867cd064ba364c9abc885227, type: 2}
|
||||
|
|
@ -227,7 +227,8 @@ MonoBehaviour:
|
|||
<IsNested>k__BackingField: 0
|
||||
<ComponentIndex>k__BackingField: 0
|
||||
<PredictedSpawn>k__BackingField: {fileID: 0}
|
||||
_networkBehaviours: []
|
||||
_networkBehaviours:
|
||||
- {fileID: 5275547274021449321}
|
||||
<SerializedRootNetworkBehaviour>k__BackingField: {fileID: 0}
|
||||
<NestedRootNetworkBehaviours>k__BackingField: []
|
||||
SerializedTransformProperties:
|
||||
|
|
@ -253,7 +254,7 @@ MonoBehaviour:
|
|||
_spectatorInterpolation: 2
|
||||
_enableTeleport: 0
|
||||
_teleportThreshold: 1
|
||||
<PrefabId>k__BackingField: 0
|
||||
<PrefabId>k__BackingField: 39
|
||||
<SpawnableCollectionId>k__BackingField: 0
|
||||
<SceneId>k__BackingField: 0
|
||||
<AssetPathHash>k__BackingField: 10127980120285490078
|
||||
|
|
|
|||
|
|
@ -207,7 +207,7 @@ MonoBehaviour:
|
|||
m_EditorClassIdentifier:
|
||||
_componentIndexCache: 0
|
||||
_addedNetworkObject: {fileID: 4322585729150451501}
|
||||
_networkObjectCache: {fileID: 0}
|
||||
_networkObjectCache: {fileID: 4322585729150451501}
|
||||
spriteRenderer: {fileID: 7458811019134628416}
|
||||
isWatered: 0
|
||||
interactable: {fileID: 11400000, guid: 4acadfaa780ad874384354b10ea4f74a, type: 2}
|
||||
|
|
@ -227,7 +227,8 @@ MonoBehaviour:
|
|||
<IsNested>k__BackingField: 0
|
||||
<ComponentIndex>k__BackingField: 0
|
||||
<PredictedSpawn>k__BackingField: {fileID: 0}
|
||||
_networkBehaviours: []
|
||||
_networkBehaviours:
|
||||
- {fileID: 5752113442689663652}
|
||||
<SerializedRootNetworkBehaviour>k__BackingField: {fileID: 0}
|
||||
<NestedRootNetworkBehaviours>k__BackingField: []
|
||||
SerializedTransformProperties:
|
||||
|
|
@ -253,7 +254,7 @@ MonoBehaviour:
|
|||
_spectatorInterpolation: 2
|
||||
_enableTeleport: 0
|
||||
_teleportThreshold: 1
|
||||
<PrefabId>k__BackingField: 0
|
||||
<PrefabId>k__BackingField: 40
|
||||
<SpawnableCollectionId>k__BackingField: 0
|
||||
<SceneId>k__BackingField: 0
|
||||
<AssetPathHash>k__BackingField: 12900116977784703400
|
||||
|
|
|
|||
|
|
@ -207,7 +207,7 @@ MonoBehaviour:
|
|||
m_EditorClassIdentifier:
|
||||
_componentIndexCache: 0
|
||||
_addedNetworkObject: {fileID: 4213625531542623294}
|
||||
_networkObjectCache: {fileID: 0}
|
||||
_networkObjectCache: {fileID: 4213625531542623294}
|
||||
spriteRenderer: {fileID: 5512228117735377172}
|
||||
isWatered: 0
|
||||
interactable: {fileID: 11400000, guid: 2048be7335203864993e970247dc0dc4, type: 2}
|
||||
|
|
@ -227,7 +227,8 @@ MonoBehaviour:
|
|||
<IsNested>k__BackingField: 0
|
||||
<ComponentIndex>k__BackingField: 0
|
||||
<PredictedSpawn>k__BackingField: {fileID: 0}
|
||||
_networkBehaviours: []
|
||||
_networkBehaviours:
|
||||
- {fileID: 5626926615564928919}
|
||||
<SerializedRootNetworkBehaviour>k__BackingField: {fileID: 0}
|
||||
<NestedRootNetworkBehaviours>k__BackingField: []
|
||||
SerializedTransformProperties:
|
||||
|
|
@ -253,7 +254,7 @@ MonoBehaviour:
|
|||
_spectatorInterpolation: 2
|
||||
_enableTeleport: 0
|
||||
_teleportThreshold: 1
|
||||
<PrefabId>k__BackingField: 0
|
||||
<PrefabId>k__BackingField: 41
|
||||
<SpawnableCollectionId>k__BackingField: 0
|
||||
<SceneId>k__BackingField: 0
|
||||
<AssetPathHash>k__BackingField: 1742604833407491476
|
||||
|
|
|
|||
|
|
@ -207,7 +207,7 @@ MonoBehaviour:
|
|||
m_EditorClassIdentifier:
|
||||
_componentIndexCache: 0
|
||||
_addedNetworkObject: {fileID: 6800731336010693423}
|
||||
_networkObjectCache: {fileID: 0}
|
||||
_networkObjectCache: {fileID: 6800731336010693423}
|
||||
spriteRenderer: {fileID: 5176395404087809385}
|
||||
isWatered: 0
|
||||
interactable: {fileID: 11400000, guid: 2048be7335203864993e970247dc0dc4, type: 2}
|
||||
|
|
@ -227,7 +227,8 @@ MonoBehaviour:
|
|||
<IsNested>k__BackingField: 0
|
||||
<ComponentIndex>k__BackingField: 0
|
||||
<PredictedSpawn>k__BackingField: {fileID: 0}
|
||||
_networkBehaviours: []
|
||||
_networkBehaviours:
|
||||
- {fileID: 6410995974218941696}
|
||||
<SerializedRootNetworkBehaviour>k__BackingField: {fileID: 0}
|
||||
<NestedRootNetworkBehaviours>k__BackingField: []
|
||||
SerializedTransformProperties:
|
||||
|
|
@ -253,7 +254,7 @@ MonoBehaviour:
|
|||
_spectatorInterpolation: 2
|
||||
_enableTeleport: 0
|
||||
_teleportThreshold: 1
|
||||
<PrefabId>k__BackingField: 0
|
||||
<PrefabId>k__BackingField: 42
|
||||
<SpawnableCollectionId>k__BackingField: 0
|
||||
<SceneId>k__BackingField: 0
|
||||
<AssetPathHash>k__BackingField: 7252566435109839684
|
||||
|
|
|
|||
|
|
@ -70,7 +70,7 @@ MonoBehaviour:
|
|||
_enableNetworkLod: 0
|
||||
_levelOfDetailDistances: []
|
||||
_updateHostVisibility: 1
|
||||
_maximumTimedObserversDuration: 10
|
||||
_maximumTimedObserversDuration: 6.49
|
||||
_defaultConditions:
|
||||
- {fileID: 11400000, guid: 2033f54fd2794464bae08fa5a55c8996, type: 2}
|
||||
--- !u!114 &6774658474764124443
|
||||
|
|
|
|||
|
|
@ -1329,12 +1329,12 @@ GameObject:
|
|||
- component: {fileID: 366143922403065942}
|
||||
- component: {fileID: 7500446676508545717}
|
||||
- component: {fileID: -1417782533930173870}
|
||||
- component: {fileID: 1772910918690186728}
|
||||
- component: {fileID: 1181134292354814940}
|
||||
- component: {fileID: -1577629087887214382}
|
||||
- component: {fileID: 5264884371971613558}
|
||||
- component: {fileID: 6362460223039606254}
|
||||
- component: {fileID: 549521313846108907}
|
||||
- component: {fileID: -1464338135805156849}
|
||||
m_Layer: 0
|
||||
m_Name: Player
|
||||
m_TagString: Untagged
|
||||
|
|
@ -1355,6 +1355,7 @@ Transform:
|
|||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children:
|
||||
- {fileID: 668907622253418370}
|
||||
- {fileID: 8392833474421242170}
|
||||
- {fileID: 479044088379335568}
|
||||
- {fileID: 6963968477584199134}
|
||||
|
|
@ -1562,12 +1563,13 @@ MonoBehaviour:
|
|||
_networkBehaviours:
|
||||
- {fileID: 7202410949277811474}
|
||||
- {fileID: -1417782533930173870}
|
||||
- {fileID: 1772910918690186728}
|
||||
- {fileID: 1181134292354814940}
|
||||
- {fileID: -1577629087887214382}
|
||||
- {fileID: 5264884371971613558}
|
||||
- {fileID: 6362460223039606254}
|
||||
- {fileID: 549521313846108907}
|
||||
- {fileID: 0}
|
||||
- {fileID: 0}
|
||||
<SerializedRootNetworkBehaviour>k__BackingField: {fileID: 0}
|
||||
<NestedRootNetworkBehaviours>k__BackingField: []
|
||||
SerializedTransformProperties:
|
||||
|
|
@ -1576,7 +1578,7 @@ MonoBehaviour:
|
|||
LocalScale: {x: 0, y: 0, z: 0}
|
||||
_isNetworked: 1
|
||||
_isSpawnable: 1
|
||||
_isGlobal: 0
|
||||
_isGlobal: 1
|
||||
_initializeOrder: 0
|
||||
_defaultDespawnType: 0
|
||||
NetworkObserver: {fileID: 0}
|
||||
|
|
@ -1593,7 +1595,7 @@ MonoBehaviour:
|
|||
_spectatorInterpolation: 2
|
||||
_enableTeleport: 0
|
||||
_teleportThreshold: 1
|
||||
<PrefabId>k__BackingField: 35
|
||||
<PrefabId>k__BackingField: 34
|
||||
<SpawnableCollectionId>k__BackingField: 0
|
||||
<SceneId>k__BackingField: 0
|
||||
<AssetPathHash>k__BackingField: 13628332130000829123
|
||||
|
|
@ -1616,26 +1618,9 @@ MonoBehaviour:
|
|||
toolbarManager: {fileID: 6362460223039606254}
|
||||
equipmentManager: {fileID: 549521313846108907}
|
||||
playerGo: {fileID: 7194374020966037453}
|
||||
playerCamera: {fileID: 0}
|
||||
playerCamera: {fileID: 6785728660406467129}
|
||||
gameManagerPrefab: {fileID: 1155193144633609695, guid: 04359b8867a2d794aad6b521a16e8d21, type: 3}
|
||||
gameManager: {fileID: 0}
|
||||
--- !u!114 &1772910918690186728
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 7194374020966037453}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: d708b74c23c34b72bcadb446c960e1f9, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
_componentIndexCache: 2
|
||||
_addedNetworkObject: {fileID: 7500446676508545717}
|
||||
_networkObjectCache: {fileID: 7500446676508545717}
|
||||
objToSpawn: {fileID: 1099441969732328810, guid: 04359b8867a2d794aad6b521a16e8d21, type: 3}
|
||||
spawnedObj: {fileID: 0}
|
||||
--- !u!114 &1181134292354814940
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -1648,7 +1633,7 @@ MonoBehaviour:
|
|||
m_Script: {fileID: 11500000, guid: a2836e36774ca1c4bbbee976e17b649c, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
_componentIndexCache: 3
|
||||
_componentIndexCache: 2
|
||||
_addedNetworkObject: {fileID: 7500446676508545717}
|
||||
_networkObjectCache: {fileID: 7500446676508545717}
|
||||
_componentConfiguration: 3
|
||||
|
|
@ -1668,8 +1653,8 @@ MonoBehaviour:
|
|||
_interval: 1
|
||||
_synchronizePosition: 1
|
||||
_positionSnapping:
|
||||
X: 0
|
||||
Y: 0
|
||||
X: 1
|
||||
Y: 1
|
||||
Z: 0
|
||||
_synchronizeRotation: 1
|
||||
_rotationSnapping:
|
||||
|
|
@ -1693,7 +1678,7 @@ MonoBehaviour:
|
|||
m_Script: {fileID: 11500000, guid: e8cac635f24954048aad3a6ff9110beb, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
_componentIndexCache: 4
|
||||
_componentIndexCache: 3
|
||||
_addedNetworkObject: {fileID: 7500446676508545717}
|
||||
_networkObjectCache: {fileID: 7500446676508545717}
|
||||
IgnoredParameters: []
|
||||
|
|
@ -1715,7 +1700,7 @@ MonoBehaviour:
|
|||
m_Script: {fileID: 11500000, guid: 7307db9affb0e3d41a6d0bc5afcdc1af, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
_componentIndexCache: 5
|
||||
_componentIndexCache: 4
|
||||
_addedNetworkObject: {fileID: 7500446676508545717}
|
||||
_networkObjectCache: {fileID: 7500446676508545717}
|
||||
playerManager: {fileID: -1417782533930173870}
|
||||
|
|
@ -1731,7 +1716,7 @@ MonoBehaviour:
|
|||
m_Script: {fileID: 11500000, guid: fb47975b92514e63abbe9147cff0c7ac, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
_componentIndexCache: 6
|
||||
_componentIndexCache: 5
|
||||
_addedNetworkObject: {fileID: 7500446676508545717}
|
||||
_networkObjectCache: {fileID: 7500446676508545717}
|
||||
playerManager: {fileID: -1417782533930173870}
|
||||
|
|
@ -1747,10 +1732,31 @@ MonoBehaviour:
|
|||
m_Script: {fileID: 11500000, guid: a01e628262f74ce98e48cc21247081a3, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
_componentIndexCache: 7
|
||||
_componentIndexCache: 6
|
||||
_addedNetworkObject: {fileID: 7500446676508545717}
|
||||
_networkObjectCache: {fileID: 7500446676508545717}
|
||||
playerManager: {fileID: -1417782533930173870}
|
||||
--- !u!114 &-1464338135805156849
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 7194374020966037453}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: be3cb2952c351714c963b0766f53cef3, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
_componentIndexCache: 255
|
||||
_addedNetworkObject: {fileID: 7500446676508545717}
|
||||
_networkObjectCache: {fileID: 0}
|
||||
_maximumSimultaneousHits: 16
|
||||
_historyDuration: 0.5
|
||||
_additionalSize: 0.1
|
||||
_layers:
|
||||
serializedVersion: 2
|
||||
m_Bits: 0
|
||||
--- !u!1 &7401015952524906830
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -2006,3 +2012,90 @@ SpriteRenderer:
|
|||
m_WasSpriteAssigned: 1
|
||||
m_MaskInteraction: 0
|
||||
m_SpriteSortPoint: 0
|
||||
--- !u!1001 &1156562443328600608
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
serializedVersion: 2
|
||||
m_Modification:
|
||||
serializedVersion: 3
|
||||
m_TransformParent: {fileID: 2753946225696872537}
|
||||
m_Modifications:
|
||||
- target: {fileID: 1820721548829388194, guid: 75c5ec3d38d56cc469760a3056a1a2c9, type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1820721548829388194, guid: 75c5ec3d38d56cc469760a3056a1a2c9, type: 3}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1820721548829388194, guid: 75c5ec3d38d56cc469760a3056a1a2c9, type: 3}
|
||||
propertyPath: m_LocalPosition.z
|
||||
value: -10
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1820721548829388194, guid: 75c5ec3d38d56cc469760a3056a1a2c9, type: 3}
|
||||
propertyPath: m_LocalRotation.w
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1820721548829388194, guid: 75c5ec3d38d56cc469760a3056a1a2c9, type: 3}
|
||||
propertyPath: m_LocalRotation.x
|
||||
value: -0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1820721548829388194, guid: 75c5ec3d38d56cc469760a3056a1a2c9, type: 3}
|
||||
propertyPath: m_LocalRotation.y
|
||||
value: -0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1820721548829388194, guid: 75c5ec3d38d56cc469760a3056a1a2c9, type: 3}
|
||||
propertyPath: m_LocalRotation.z
|
||||
value: -0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1820721548829388194, guid: 75c5ec3d38d56cc469760a3056a1a2c9, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1820721548829388194, guid: 75c5ec3d38d56cc469760a3056a1a2c9, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1820721548829388194, guid: 75c5ec3d38d56cc469760a3056a1a2c9, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4917769876847807159, guid: 75c5ec3d38d56cc469760a3056a1a2c9, type: 3}
|
||||
propertyPath: m_Follow
|
||||
value:
|
||||
objectReference: {fileID: 2753946225696872537}
|
||||
- target: {fileID: 5051619997052790706, guid: 75c5ec3d38d56cc469760a3056a1a2c9, type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5051619997052790706, guid: 75c5ec3d38d56cc469760a3056a1a2c9, type: 3}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5230034042738412359, guid: 75c5ec3d38d56cc469760a3056a1a2c9, type: 3}
|
||||
propertyPath: m_Name
|
||||
value: Main Camera
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5230034042738412359, guid: 75c5ec3d38d56cc469760a3056a1a2c9, type: 3}
|
||||
propertyPath: m_IsActive
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5631521715186974745, guid: 75c5ec3d38d56cc469760a3056a1a2c9, type: 3}
|
||||
propertyPath: m_Enabled
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_RemovedGameObjects: []
|
||||
m_AddedGameObjects: []
|
||||
m_AddedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: 75c5ec3d38d56cc469760a3056a1a2c9, type: 3}
|
||||
--- !u!4 &668907622253418370 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 1820721548829388194, guid: 75c5ec3d38d56cc469760a3056a1a2c9, type: 3}
|
||||
m_PrefabInstance: {fileID: 1156562443328600608}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!20 &6785728660406467129 stripped
|
||||
Camera:
|
||||
m_CorrespondingSourceObject: {fileID: 5631521715186974745, guid: 75c5ec3d38d56cc469760a3056a1a2c9, type: 3}
|
||||
m_PrefabInstance: {fileID: 1156562443328600608}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
|
|
|||
|
|
@ -12,6 +12,8 @@ GameObject:
|
|||
- component: {fileID: 5551679991364744983}
|
||||
- component: {fileID: 2467740212711513134}
|
||||
- component: {fileID: 5186788049215247401}
|
||||
- component: {fileID: 9091365521926218355}
|
||||
- component: {fileID: 2401461192666499815}
|
||||
m_Layer: 0
|
||||
m_Name: SceneChangeTrigger
|
||||
m_TagString: Untagged
|
||||
|
|
@ -54,7 +56,7 @@ MonoBehaviour:
|
|||
_additionalSize: 0.1
|
||||
_layers:
|
||||
serializedVersion: 2
|
||||
m_Bits: 0
|
||||
m_Bits: 1
|
||||
--- !u!61 &2467740212711513134
|
||||
BoxCollider2D:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -84,10 +86,10 @@ BoxCollider2D:
|
|||
m_CallbackLayers:
|
||||
serializedVersion: 2
|
||||
m_Bits: 4294967295
|
||||
m_IsTrigger: 0
|
||||
m_IsTrigger: 1
|
||||
m_UsedByEffector: 0
|
||||
m_UsedByComposite: 0
|
||||
m_Offset: {x: 0, y: -2.1540544}
|
||||
m_Offset: {x: -0.015033007, y: 0.025738478}
|
||||
m_SpriteTilingProperty:
|
||||
border: {x: 0, y: 0, z: 0, w: 0}
|
||||
pivot: {x: 0, y: 0}
|
||||
|
|
@ -98,7 +100,7 @@ BoxCollider2D:
|
|||
adaptiveTiling: 0
|
||||
m_AutoTiling: 0
|
||||
serializedVersion: 2
|
||||
m_Size: {x: 1, y: 5.308109}
|
||||
m_Size: {x: 0.969934, y: 0.94852304}
|
||||
m_EdgeRadius: 0
|
||||
--- !u!114 &5186788049215247401
|
||||
MonoBehaviour:
|
||||
|
|
@ -117,6 +119,7 @@ MonoBehaviour:
|
|||
<PredictedSpawn>k__BackingField: {fileID: 0}
|
||||
_networkBehaviours:
|
||||
- {fileID: 5551679991364744983}
|
||||
- {fileID: 9091365521926218355}
|
||||
<SerializedRootNetworkBehaviour>k__BackingField: {fileID: 0}
|
||||
<NestedRootNetworkBehaviours>k__BackingField: []
|
||||
SerializedTransformProperties:
|
||||
|
|
@ -124,7 +127,7 @@ MonoBehaviour:
|
|||
Rotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
LocalScale: {x: 1, y: 1, z: 1}
|
||||
_isNetworked: 1
|
||||
_isSpawnable: 1
|
||||
_isSpawnable: 0
|
||||
_isGlobal: 0
|
||||
_initializeOrder: 0
|
||||
_defaultDespawnType: 0
|
||||
|
|
@ -142,7 +145,45 @@ MonoBehaviour:
|
|||
_spectatorInterpolation: 2
|
||||
_enableTeleport: 0
|
||||
_teleportThreshold: 1
|
||||
<PrefabId>k__BackingField: 0
|
||||
<PrefabId>k__BackingField: 2
|
||||
<SpawnableCollectionId>k__BackingField: 0
|
||||
<SceneId>k__BackingField: 0
|
||||
<AssetPathHash>k__BackingField: 4072359962360822577
|
||||
--- !u!114 &9091365521926218355
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 3463712308332304479}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 624abc0263964a90b146b5a469faec83, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
_componentIndexCache: 1
|
||||
_addedNetworkObject: {fileID: 5186788049215247401}
|
||||
_networkObjectCache: {fileID: 5186788049215247401}
|
||||
sceneName: Home
|
||||
spawnPosition: {x: 0, y: 0, z: 0}
|
||||
--- !u!114 &2401461192666499815
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 3463712308332304479}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: a60424afcf0b5984dbe878a1f21c10b2, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
_componentIndexCache: 255
|
||||
_addedNetworkObject: {fileID: 5186788049215247401}
|
||||
_networkObjectCache: {fileID: 0}
|
||||
_maximumSimultaneousHits: 16
|
||||
_historyDuration: 0.5
|
||||
_additionalSize: 0.1
|
||||
_layers:
|
||||
serializedVersion: 2
|
||||
m_Bits: 0
|
||||
|
|
|
|||
|
|
@ -56,8 +56,7 @@ MonoBehaviour:
|
|||
hotkeyManager: {fileID: 0}
|
||||
audioManager: {fileID: 0}
|
||||
uiManager: {fileID: 0}
|
||||
currentState: 0
|
||||
players: []
|
||||
gameManagerPlayer: {fileID: 0}
|
||||
itemDatabase: {fileID: 0}
|
||||
--- !u!114 &1155193144633609695
|
||||
MonoBehaviour:
|
||||
|
|
@ -101,7 +100,7 @@ MonoBehaviour:
|
|||
_spectatorInterpolation: 2
|
||||
_enableTeleport: 0
|
||||
_teleportThreshold: 1
|
||||
<PrefabId>k__BackingField: 25
|
||||
<PrefabId>k__BackingField: 3
|
||||
<SpawnableCollectionId>k__BackingField: 0
|
||||
<SceneId>k__BackingField: 0
|
||||
<AssetPathHash>k__BackingField: 9960890010809320037
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
|
|
@ -1462,196 +1462,6 @@ SpriteRenderer:
|
|||
m_WasSpriteAssigned: 1
|
||||
m_MaskInteraction: 0
|
||||
m_SpriteSortPoint: 0
|
||||
--- !u!1 &401349964
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 401349969}
|
||||
- component: {fileID: 401349968}
|
||||
- component: {fileID: 401349967}
|
||||
- component: {fileID: 401349966}
|
||||
- component: {fileID: 401349965}
|
||||
- component: {fileID: 401349970}
|
||||
m_Layer: 0
|
||||
m_Name: Main Camera
|
||||
m_TagString: MainCamera
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!114 &401349965
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 401349964}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: a79441f348de89743a2939f4d699eac1, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_RenderShadows: 1
|
||||
m_RequiresDepthTextureOption: 2
|
||||
m_RequiresOpaqueTextureOption: 2
|
||||
m_CameraType: 0
|
||||
m_Cameras: []
|
||||
m_RendererIndex: -1
|
||||
m_VolumeLayerMask:
|
||||
serializedVersion: 2
|
||||
m_Bits: 1
|
||||
m_VolumeTrigger: {fileID: 0}
|
||||
m_VolumeFrameworkUpdateModeOption: 2
|
||||
m_RenderPostProcessing: 0
|
||||
m_Antialiasing: 0
|
||||
m_AntialiasingQuality: 2
|
||||
m_StopNaN: 0
|
||||
m_Dithering: 0
|
||||
m_ClearDepth: 1
|
||||
m_AllowXRRendering: 1
|
||||
m_AllowHDROutput: 1
|
||||
m_UseScreenCoordOverride: 0
|
||||
m_ScreenSizeOverride: {x: 0, y: 0, z: 0, w: 0}
|
||||
m_ScreenCoordScaleBias: {x: 0, y: 0, z: 0, w: 0}
|
||||
m_RequiresDepthTexture: 0
|
||||
m_RequiresColorTexture: 0
|
||||
m_Version: 2
|
||||
m_TaaSettings:
|
||||
m_Quality: 3
|
||||
m_FrameInfluence: 0.1
|
||||
m_JitterScale: 1
|
||||
m_MipBias: 0
|
||||
m_VarianceClampScale: 0.9
|
||||
m_ContrastAdaptiveSharpening: 0
|
||||
--- !u!114 &401349966
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 401349964}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 72ece51f2901e7445ab60da3685d6b5f, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_ShowDebugText: 0
|
||||
m_ShowCameraFrustum: 1
|
||||
m_IgnoreTimeScale: 0
|
||||
m_WorldUpOverride: {fileID: 0}
|
||||
m_UpdateMethod: 2
|
||||
m_BlendUpdateMethod: 1
|
||||
m_DefaultBlend:
|
||||
m_Style: 1
|
||||
m_Time: 2
|
||||
m_CustomCurve:
|
||||
serializedVersion: 2
|
||||
m_Curve: []
|
||||
m_PreInfinity: 2
|
||||
m_PostInfinity: 2
|
||||
m_RotationOrder: 4
|
||||
m_CustomBlends: {fileID: 0}
|
||||
m_CameraCutEvent:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_CameraActivatedEvent:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
--- !u!81 &401349967
|
||||
AudioListener:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 401349964}
|
||||
m_Enabled: 1
|
||||
--- !u!20 &401349968
|
||||
Camera:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 401349964}
|
||||
m_Enabled: 1
|
||||
serializedVersion: 2
|
||||
m_ClearFlags: 2
|
||||
m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0}
|
||||
m_projectionMatrixMode: 1
|
||||
m_GateFitMode: 2
|
||||
m_FOVAxisMode: 0
|
||||
m_Iso: 200
|
||||
m_ShutterSpeed: 0.005
|
||||
m_Aperture: 16
|
||||
m_FocusDistance: 10
|
||||
m_FocalLength: 50
|
||||
m_BladeCount: 5
|
||||
m_Curvature: {x: 2, y: 11}
|
||||
m_BarrelClipping: 0.25
|
||||
m_Anamorphism: 0
|
||||
m_SensorSize: {x: 36, y: 24}
|
||||
m_LensShift: {x: 0, y: 0}
|
||||
m_NormalizedViewPortRect:
|
||||
serializedVersion: 2
|
||||
x: 0
|
||||
y: 0
|
||||
width: 1
|
||||
height: 1
|
||||
near clip plane: 0.3
|
||||
far clip plane: 1000
|
||||
field of view: 60
|
||||
orthographic: 1
|
||||
orthographic size: 6
|
||||
m_Depth: -1
|
||||
m_CullingMask:
|
||||
serializedVersion: 2
|
||||
m_Bits: 4294967295
|
||||
m_RenderingPath: -1
|
||||
m_TargetTexture: {fileID: 0}
|
||||
m_TargetDisplay: 0
|
||||
m_TargetEye: 0
|
||||
m_HDR: 1
|
||||
m_AllowMSAA: 0
|
||||
m_AllowDynamicResolution: 0
|
||||
m_ForceIntoRT: 0
|
||||
m_OcclusionCulling: 0
|
||||
m_StereoConvergence: 10
|
||||
m_StereoSeparation: 0.022
|
||||
--- !u!4 &401349969
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 401349964}
|
||||
serializedVersion: 2
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalPosition: {x: 19.37, y: -17.460007, z: -10}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children:
|
||||
- {fileID: 1952311937}
|
||||
m_Father: {fileID: 0}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!114 &401349970
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 401349964}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 56666c5a40171f54783dd416a44f42bf, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_EventMask:
|
||||
serializedVersion: 2
|
||||
m_Bits: 4294967295
|
||||
m_MaxRayIntersections: 0
|
||||
--- !u!1 &425699064
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -1970,6 +1780,17 @@ Transform:
|
|||
m_CorrespondingSourceObject: {fileID: 4423685822788232243, guid: 71d12b53bfe275a42b91a98a3e6e2f66, type: 3}
|
||||
m_PrefabInstance: {fileID: 757510669710930986}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!114 &558541797 stripped
|
||||
MonoBehaviour:
|
||||
m_CorrespondingSourceObject: {fileID: 5186788049215247401, guid: 71d12b53bfe275a42b91a98a3e6e2f66, type: 3}
|
||||
m_PrefabInstance: {fileID: 757510669710930986}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 0}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 26b716c41e9b56b4baafaf13a523ba2e, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
--- !u!1 &561327468
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -1980,6 +1801,7 @@ GameObject:
|
|||
m_Component:
|
||||
- component: {fileID: 561327469}
|
||||
- component: {fileID: 561327470}
|
||||
- component: {fileID: 561327471}
|
||||
m_Layer: 0
|
||||
m_Name: EnvironmentManager
|
||||
m_TagString: Untagged
|
||||
|
|
@ -2014,8 +1836,11 @@ MonoBehaviour:
|
|||
m_Script: {fileID: 11500000, guid: 6f2c9a43837d45a9b0a1b0ad3194b4d9, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
_componentIndexCache: 0
|
||||
_addedNetworkObject: {fileID: 561327471}
|
||||
_networkObjectCache: {fileID: 561327471}
|
||||
dayLengthInMinutes: 0.15
|
||||
startTimeInHours: 6
|
||||
dayStartTimeInHours: 6
|
||||
globalLight: {fileID: 1411413851}
|
||||
timeText: {fileID: 55764737}
|
||||
dayText: {fileID: 664717489}
|
||||
|
|
@ -2083,6 +1908,52 @@ MonoBehaviour:
|
|||
isFirstDay: 1
|
||||
monthsPerYear: 4
|
||||
daysPerMonth: 28
|
||||
--- !u!114 &561327471
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 561327468}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 26b716c41e9b56b4baafaf13a523ba2e, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
<IsNested>k__BackingField: 0
|
||||
<ComponentIndex>k__BackingField: 0
|
||||
<PredictedSpawn>k__BackingField: {fileID: 0}
|
||||
_networkBehaviours:
|
||||
- {fileID: 561327470}
|
||||
<SerializedRootNetworkBehaviour>k__BackingField: {fileID: 0}
|
||||
<NestedRootNetworkBehaviours>k__BackingField: []
|
||||
SerializedTransformProperties:
|
||||
Position: {x: 34.66939, y: -42.59865, z: 1.4275343}
|
||||
Rotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
LocalScale: {x: 1, y: 1, z: 1}
|
||||
_isNetworked: 1
|
||||
_isSpawnable: 1
|
||||
_isGlobal: 0
|
||||
_initializeOrder: 0
|
||||
_defaultDespawnType: 0
|
||||
NetworkObserver: {fileID: 0}
|
||||
_enablePrediction: 0
|
||||
_predictionType: 0
|
||||
_graphicalObject: {fileID: 0}
|
||||
_detachGraphicalObject: 0
|
||||
_enableStateForwarding: 1
|
||||
_networkTransform: {fileID: 0}
|
||||
_ownerInterpolation: 1
|
||||
_ownerSmoothedProperties: 255
|
||||
_adaptiveInterpolation: 3
|
||||
_spectatorSmoothedProperties: 255
|
||||
_spectatorInterpolation: 2
|
||||
_enableTeleport: 0
|
||||
_teleportThreshold: 1
|
||||
<PrefabId>k__BackingField: 0
|
||||
<SpawnableCollectionId>k__BackingField: 0
|
||||
<SceneId>k__BackingField: 4255346685
|
||||
<AssetPathHash>k__BackingField: 0
|
||||
--- !u!1 &631545154
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -2712,6 +2583,95 @@ Transform:
|
|||
m_Children: []
|
||||
m_Father: {fileID: 2064477685}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!1001 &897148936
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
serializedVersion: 2
|
||||
m_Modification:
|
||||
serializedVersion: 3
|
||||
m_TransformParent: {fileID: 0}
|
||||
m_Modifications:
|
||||
- target: {fileID: 2467740212711513134, guid: 71d12b53bfe275a42b91a98a3e6e2f66, type: 3}
|
||||
propertyPath: m_Size.x
|
||||
value: 7.2260723
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2467740212711513134, guid: 71d12b53bfe275a42b91a98a3e6e2f66, type: 3}
|
||||
propertyPath: m_Size.y
|
||||
value: 0.6069522
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2467740212711513134, guid: 71d12b53bfe275a42b91a98a3e6e2f66, type: 3}
|
||||
propertyPath: m_Offset.x
|
||||
value: 4.1377487
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2467740212711513134, guid: 71d12b53bfe275a42b91a98a3e6e2f66, type: 3}
|
||||
propertyPath: m_Offset.y
|
||||
value: -0.7922337
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3463712308332304479, guid: 71d12b53bfe275a42b91a98a3e6e2f66, type: 3}
|
||||
propertyPath: m_Name
|
||||
value: SceneChangeTrigger (1)
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4423685822788232243, guid: 71d12b53bfe275a42b91a98a3e6e2f66, type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: -0.53986764
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4423685822788232243, guid: 71d12b53bfe275a42b91a98a3e6e2f66, type: 3}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: -5.8394737
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4423685822788232243, guid: 71d12b53bfe275a42b91a98a3e6e2f66, type: 3}
|
||||
propertyPath: m_LocalPosition.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4423685822788232243, guid: 71d12b53bfe275a42b91a98a3e6e2f66, type: 3}
|
||||
propertyPath: m_LocalRotation.w
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4423685822788232243, guid: 71d12b53bfe275a42b91a98a3e6e2f66, type: 3}
|
||||
propertyPath: m_LocalRotation.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4423685822788232243, guid: 71d12b53bfe275a42b91a98a3e6e2f66, type: 3}
|
||||
propertyPath: m_LocalRotation.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4423685822788232243, guid: 71d12b53bfe275a42b91a98a3e6e2f66, type: 3}
|
||||
propertyPath: m_LocalRotation.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4423685822788232243, guid: 71d12b53bfe275a42b91a98a3e6e2f66, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4423685822788232243, guid: 71d12b53bfe275a42b91a98a3e6e2f66, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4423685822788232243, guid: 71d12b53bfe275a42b91a98a3e6e2f66, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5186788049215247401, guid: 71d12b53bfe275a42b91a98a3e6e2f66, type: 3}
|
||||
propertyPath: <SceneId>k__BackingField
|
||||
value: 4026165245
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 9091365521926218355, guid: 71d12b53bfe275a42b91a98a3e6e2f66, type: 3}
|
||||
propertyPath: sceneName
|
||||
value: FarmMap
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 9091365521926218355, guid: 71d12b53bfe275a42b91a98a3e6e2f66, type: 3}
|
||||
propertyPath: spawnPosition.x
|
||||
value: 30
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 9091365521926218355, guid: 71d12b53bfe275a42b91a98a3e6e2f66, type: 3}
|
||||
propertyPath: spawnPosition.y
|
||||
value: -30
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_RemovedGameObjects: []
|
||||
m_AddedGameObjects: []
|
||||
m_AddedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: 71d12b53bfe275a42b91a98a3e6e2f66, type: 3}
|
||||
--- !u!1 &907327541
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -3355,122 +3315,6 @@ Transform:
|
|||
m_Children: []
|
||||
m_Father: {fileID: 2064477685}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!1 &1334256388
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 3
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 1334256389}
|
||||
- component: {fileID: 1334256392}
|
||||
- component: {fileID: 1334256391}
|
||||
- component: {fileID: 1334256390}
|
||||
m_Layer: 0
|
||||
m_Name: cm
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!4 &1334256389
|
||||
Transform:
|
||||
m_ObjectHideFlags: 3
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1334256388}
|
||||
serializedVersion: 2
|
||||
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
m_Father: {fileID: 1952311937}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!114 &1334256390
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 3
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1334256388}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 6ad980451443d70438faac0bc6c235a0, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_TrackedObjectOffset: {x: 0, y: 0, z: 0}
|
||||
m_LookaheadTime: 0
|
||||
m_LookaheadSmoothing: 0
|
||||
m_LookaheadIgnoreY: 0
|
||||
m_XDamping: 1
|
||||
m_YDamping: 1
|
||||
m_ZDamping: 1
|
||||
m_TargetMovementOnly: 1
|
||||
m_ScreenX: 0.5
|
||||
m_ScreenY: 0.5
|
||||
m_CameraDistance: 10
|
||||
m_DeadZoneWidth: 0
|
||||
m_DeadZoneHeight: 0
|
||||
m_DeadZoneDepth: 0
|
||||
m_UnlimitedSoftZone: 0
|
||||
m_SoftZoneWidth: 0.8
|
||||
m_SoftZoneHeight: 0.8
|
||||
m_BiasX: 0
|
||||
m_BiasY: 0
|
||||
m_CenterOnActivate: 1
|
||||
m_GroupFramingMode: 2
|
||||
m_AdjustmentMode: 0
|
||||
m_GroupFramingSize: 0.8
|
||||
m_MaxDollyIn: 5000
|
||||
m_MaxDollyOut: 5000
|
||||
m_MinimumDistance: 1
|
||||
m_MaximumDistance: 5000
|
||||
m_MinimumFOV: 3
|
||||
m_MaximumFOV: 60
|
||||
m_MinimumOrthoSize: 1
|
||||
m_MaximumOrthoSize: 5000
|
||||
--- !u!114 &1334256391
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 3
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1334256388}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: f4044717213e31446939f7bd49c896ea, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_TrackedObjectOffset: {x: 0, y: 0, z: 0}
|
||||
m_LookaheadTime: 0
|
||||
m_LookaheadSmoothing: 0
|
||||
m_LookaheadIgnoreY: 0
|
||||
m_HorizontalDamping: 0.5
|
||||
m_VerticalDamping: 0.5
|
||||
m_ScreenX: 0.5
|
||||
m_ScreenY: 0.5
|
||||
m_DeadZoneWidth: 0
|
||||
m_DeadZoneHeight: 0
|
||||
m_SoftZoneWidth: 0.8
|
||||
m_SoftZoneHeight: 0.8
|
||||
m_BiasX: 0
|
||||
m_BiasY: 0
|
||||
m_CenterOnActivate: 1
|
||||
--- !u!114 &1334256392
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 3
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1334256388}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: ac0b09e7857660247b1477e93731de29, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
--- !u!1 &1381237086
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -4808,7 +4652,7 @@ PrefabInstance:
|
|||
- target: {fileID: 3886580715314287751, guid: 39759b252d2a3b14bac95b998153b10c, type: 3}
|
||||
propertyPath: m_Camera
|
||||
value:
|
||||
objectReference: {fileID: 401349968}
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3886580715314287751, guid: 39759b252d2a3b14bac95b998153b10c, type: 3}
|
||||
propertyPath: m_SortingLayerID
|
||||
value: -1063265501
|
||||
|
|
@ -6201,7 +6045,7 @@ MonoBehaviour:
|
|||
- {fileID: 1453009442}
|
||||
<SerializedRootNetworkBehaviour>k__BackingField: {fileID: 0}
|
||||
<NestedRootNetworkBehaviours>k__BackingField:
|
||||
- {fileID: 0}
|
||||
- {fileID: 558541797}
|
||||
SerializedTransformProperties:
|
||||
Position: {x: 0, y: 0, z: 0}
|
||||
Rotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
|
|
@ -6227,7 +6071,7 @@ MonoBehaviour:
|
|||
_teleportThreshold: 1
|
||||
<PrefabId>k__BackingField: 0
|
||||
<SpawnableCollectionId>k__BackingField: 0
|
||||
<SceneId>k__BackingField: 3388932093
|
||||
<SceneId>k__BackingField: 2096264447
|
||||
<AssetPathHash>k__BackingField: 0
|
||||
--- !u!114 &1453009442
|
||||
MonoBehaviour:
|
||||
|
|
@ -6287,6 +6131,10 @@ PrefabInstance:
|
|||
propertyPath: m_Name
|
||||
value: GameManager
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1155193144633609695, guid: d27075628330ae74082130fac9663ba3, type: 3}
|
||||
propertyPath: <SceneId>k__BackingField
|
||||
value: 2107864831
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1878198276469643664, guid: d27075628330ae74082130fac9663ba3, type: 3}
|
||||
propertyPath: m_Pivot.x
|
||||
value: 0.5
|
||||
|
|
@ -6664,91 +6512,6 @@ Transform:
|
|||
m_Children: []
|
||||
m_Father: {fileID: 1110821620}
|
||||
m_LocalEulerAnglesHint: {x: 2.75, y: -0.008, z: 0}
|
||||
--- !u!1 &1952311936
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 1952311937}
|
||||
- component: {fileID: 1952311939}
|
||||
- component: {fileID: 1952311938}
|
||||
m_Layer: 0
|
||||
m_Name: Virtual Camera
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!4 &1952311937
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1952311936}
|
||||
serializedVersion: 2
|
||||
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children:
|
||||
- {fileID: 1334256389}
|
||||
m_Father: {fileID: 401349969}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!114 &1952311938
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1952311936}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 1a8a05de0ac134f4f9d01bef6b9da077, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
--- !u!114 &1952311939
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1952311936}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 45e653bab7fb20e499bda25e1b646fea, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_ExcludedPropertiesInInspector:
|
||||
- m_Script
|
||||
m_LockStageInInspector:
|
||||
m_StreamingVersion: 20170927
|
||||
m_Priority: 10
|
||||
m_StandbyUpdate: 2
|
||||
m_LookAt: {fileID: 0}
|
||||
m_Follow: {fileID: 0}
|
||||
m_Lens:
|
||||
FieldOfView: 60
|
||||
OrthographicSize: 6
|
||||
NearClipPlane: 0.3
|
||||
FarClipPlane: 1000
|
||||
Dutch: 0
|
||||
ModeOverride: 0
|
||||
LensShift: {x: 0, y: 0}
|
||||
GateFit: 2
|
||||
FocusDistance: 10
|
||||
m_SensorSize: {x: 1, y: 1}
|
||||
m_Transitions:
|
||||
m_BlendHint: 0
|
||||
m_InheritPosition: 0
|
||||
m_OnCameraLive:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_LegacyBlendHint: 0
|
||||
m_ComponentOwner: {fileID: 1334256389}
|
||||
--- !u!1 &1983354720
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -7001,6 +6764,95 @@ Transform:
|
|||
m_Children: []
|
||||
m_Father: {fileID: 2064477685}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!1001 &2033363832
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
serializedVersion: 2
|
||||
m_Modification:
|
||||
serializedVersion: 3
|
||||
m_TransformParent: {fileID: 0}
|
||||
m_Modifications:
|
||||
- target: {fileID: 2467740212711513134, guid: 71d12b53bfe275a42b91a98a3e6e2f66, type: 3}
|
||||
propertyPath: m_Size.x
|
||||
value: 1.1317307
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2467740212711513134, guid: 71d12b53bfe275a42b91a98a3e6e2f66, type: 3}
|
||||
propertyPath: m_Size.y
|
||||
value: 2.8361511
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2467740212711513134, guid: 71d12b53bfe275a42b91a98a3e6e2f66, type: 3}
|
||||
propertyPath: m_Offset.x
|
||||
value: 0.06586534
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2467740212711513134, guid: 71d12b53bfe275a42b91a98a3e6e2f66, type: 3}
|
||||
propertyPath: m_Offset.y
|
||||
value: 0.9695525
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3463712308332304479, guid: 71d12b53bfe275a42b91a98a3e6e2f66, type: 3}
|
||||
propertyPath: m_Name
|
||||
value: SceneChangeTrigger
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4423685822788232243, guid: 71d12b53bfe275a42b91a98a3e6e2f66, type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: -0.53986764
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4423685822788232243, guid: 71d12b53bfe275a42b91a98a3e6e2f66, type: 3}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: -5.8394737
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4423685822788232243, guid: 71d12b53bfe275a42b91a98a3e6e2f66, type: 3}
|
||||
propertyPath: m_LocalPosition.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4423685822788232243, guid: 71d12b53bfe275a42b91a98a3e6e2f66, type: 3}
|
||||
propertyPath: m_LocalRotation.w
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4423685822788232243, guid: 71d12b53bfe275a42b91a98a3e6e2f66, type: 3}
|
||||
propertyPath: m_LocalRotation.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4423685822788232243, guid: 71d12b53bfe275a42b91a98a3e6e2f66, type: 3}
|
||||
propertyPath: m_LocalRotation.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4423685822788232243, guid: 71d12b53bfe275a42b91a98a3e6e2f66, type: 3}
|
||||
propertyPath: m_LocalRotation.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4423685822788232243, guid: 71d12b53bfe275a42b91a98a3e6e2f66, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4423685822788232243, guid: 71d12b53bfe275a42b91a98a3e6e2f66, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4423685822788232243, guid: 71d12b53bfe275a42b91a98a3e6e2f66, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5186788049215247401, guid: 71d12b53bfe275a42b91a98a3e6e2f66, type: 3}
|
||||
propertyPath: <SceneId>k__BackingField
|
||||
value: 1872918527
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 9091365521926218355, guid: 71d12b53bfe275a42b91a98a3e6e2f66, type: 3}
|
||||
propertyPath: sceneName
|
||||
value: FarmMap
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 9091365521926218355, guid: 71d12b53bfe275a42b91a98a3e6e2f66, type: 3}
|
||||
propertyPath: spawnPosition.x
|
||||
value: 30
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 9091365521926218355, guid: 71d12b53bfe275a42b91a98a3e6e2f66, type: 3}
|
||||
propertyPath: spawnPosition.y
|
||||
value: -30
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_RemovedGameObjects: []
|
||||
m_AddedGameObjects: []
|
||||
m_AddedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: 71d12b53bfe275a42b91a98a3e6e2f66, type: 3}
|
||||
--- !u!224 &2050372504 stripped
|
||||
RectTransform:
|
||||
m_CorrespondingSourceObject: {fileID: 5930219193117068973, guid: 39759b252d2a3b14bac95b998153b10c, type: 3}
|
||||
|
|
@ -7117,6 +6969,14 @@ PrefabInstance:
|
|||
propertyPath: m_LocalEulerAnglesHint.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5186788049215247401, guid: 71d12b53bfe275a42b91a98a3e6e2f66, type: 3}
|
||||
propertyPath: <SceneId>k__BackingField
|
||||
value: 4242702333
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5186788049215247401, guid: 71d12b53bfe275a42b91a98a3e6e2f66, type: 3}
|
||||
propertyPath: <IsNested>k__BackingField
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5551679991364744983, guid: 71d12b53bfe275a42b91a98a3e6e2f66, type: 3}
|
||||
propertyPath: _addedNetworkObject
|
||||
value:
|
||||
|
|
@ -7134,7 +6994,6 @@ PrefabInstance:
|
|||
SceneRoots:
|
||||
m_ObjectHideFlags: 0
|
||||
m_Roots:
|
||||
- {fileID: 401349969}
|
||||
- {fileID: 1411413852}
|
||||
- {fileID: 1453009440}
|
||||
- {fileID: 1110821620}
|
||||
|
|
@ -7142,3 +7001,5 @@ SceneRoots:
|
|||
- {fileID: 561327469}
|
||||
- {fileID: 1558583663}
|
||||
- {fileID: 651572738}
|
||||
- {fileID: 2033363832}
|
||||
- {fileID: 897148936}
|
||||
|
|
|
|||
|
|
@ -2019,16 +2019,52 @@ PrefabInstance:
|
|||
objectReference: {fileID: 508924469}
|
||||
- target: {fileID: 2467740212711513134, guid: 71d12b53bfe275a42b91a98a3e6e2f66, type: 3}
|
||||
propertyPath: m_Size.x
|
||||
value: 12.521683
|
||||
value: 0.89100313
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2467740212711513134, guid: 71d12b53bfe275a42b91a98a3e6e2f66, type: 3}
|
||||
propertyPath: m_Size.y
|
||||
value: 0.8030002
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2467740212711513134, guid: 71d12b53bfe275a42b91a98a3e6e2f66, type: 3}
|
||||
propertyPath: m_Offset.x
|
||||
value: 2.6581507
|
||||
value: 0.00040507317
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2467740212711513134, guid: 71d12b53bfe275a42b91a98a3e6e2f66, type: 3}
|
||||
propertyPath: m_Offset.y
|
||||
value: -0.007763982
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2467740212711513134, guid: 71d12b53bfe275a42b91a98a3e6e2f66, type: 3}
|
||||
propertyPath: m_IsTrigger
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2467740212711513134, guid: 71d12b53bfe275a42b91a98a3e6e2f66, type: 3}
|
||||
propertyPath: m_SpriteTilingProperty.pivot.x
|
||||
value: 0.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2467740212711513134, guid: 71d12b53bfe275a42b91a98a3e6e2f66, type: 3}
|
||||
propertyPath: m_SpriteTilingProperty.pivot.y
|
||||
value: 0.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2467740212711513134, guid: 71d12b53bfe275a42b91a98a3e6e2f66, type: 3}
|
||||
propertyPath: m_SpriteTilingProperty.newSize.x
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2467740212711513134, guid: 71d12b53bfe275a42b91a98a3e6e2f66, type: 3}
|
||||
propertyPath: m_SpriteTilingProperty.newSize.y
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2467740212711513134, guid: 71d12b53bfe275a42b91a98a3e6e2f66, type: 3}
|
||||
propertyPath: m_SpriteTilingProperty.oldSize.x
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2467740212711513134, guid: 71d12b53bfe275a42b91a98a3e6e2f66, type: 3}
|
||||
propertyPath: m_SpriteTilingProperty.oldSize.y
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2467740212711513134, guid: 71d12b53bfe275a42b91a98a3e6e2f66, type: 3}
|
||||
propertyPath: m_SpriteTilingProperty.adaptiveTilingThreshold
|
||||
value: 0.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3463712308332304479, guid: 71d12b53bfe275a42b91a98a3e6e2f66, type: 3}
|
||||
propertyPath: m_Name
|
||||
value: SceneChangeTrigger
|
||||
|
|
@ -2039,11 +2075,11 @@ PrefabInstance:
|
|||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4423685822788232243, guid: 71d12b53bfe275a42b91a98a3e6e2f66, type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: -0.54
|
||||
value: -1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4423685822788232243, guid: 71d12b53bfe275a42b91a98a3e6e2f66, type: 3}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: -1.54
|
||||
value: -2
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4423685822788232243, guid: 71d12b53bfe275a42b91a98a3e6e2f66, type: 3}
|
||||
propertyPath: m_LocalPosition.z
|
||||
|
|
@ -2077,22 +2113,38 @@ PrefabInstance:
|
|||
propertyPath: m_LocalEulerAnglesHint.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5186788049215247401, guid: 71d12b53bfe275a42b91a98a3e6e2f66, type: 3}
|
||||
propertyPath: _isSpawnable
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5186788049215247401, guid: 71d12b53bfe275a42b91a98a3e6e2f66, type: 3}
|
||||
propertyPath: <SceneId>k__BackingField
|
||||
value: 4278190071
|
||||
value: 2146401015
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5186788049215247401, guid: 71d12b53bfe275a42b91a98a3e6e2f66, type: 3}
|
||||
propertyPath: _networkBehaviours.Array.size
|
||||
value: 2
|
||||
value: 3
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5186788049215247401, guid: 71d12b53bfe275a42b91a98a3e6e2f66, type: 3}
|
||||
propertyPath: _networkBehaviours.Array.data[1]
|
||||
value:
|
||||
objectReference: {fileID: 508924471}
|
||||
- target: {fileID: 5186788049215247401, guid: 71d12b53bfe275a42b91a98a3e6e2f66, type: 3}
|
||||
propertyPath: _networkBehaviours.Array.data[2]
|
||||
value:
|
||||
objectReference: {fileID: 802857225}
|
||||
- target: {fileID: 5551679991364744983, guid: 71d12b53bfe275a42b91a98a3e6e2f66, type: 3}
|
||||
propertyPath: _networkObjectCache
|
||||
value:
|
||||
objectReference: {fileID: 508924470}
|
||||
- target: {fileID: 9091365521926218355, guid: 71d12b53bfe275a42b91a98a3e6e2f66, type: 3}
|
||||
propertyPath: _networkObjectCache
|
||||
value:
|
||||
objectReference: {fileID: 508924470}
|
||||
- target: {fileID: 9091365521926218355, guid: 71d12b53bfe275a42b91a98a3e6e2f66, type: 3}
|
||||
propertyPath: _componentIndexCache
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents:
|
||||
- {fileID: 665168782243639684, guid: 71d12b53bfe275a42b91a98a3e6e2f66, type: 3}
|
||||
m_RemovedGameObjects: []
|
||||
|
|
@ -2104,6 +2156,9 @@ PrefabInstance:
|
|||
- targetCorrespondingSourceObject: {fileID: 3463712308332304479, guid: 71d12b53bfe275a42b91a98a3e6e2f66, type: 3}
|
||||
insertIndex: -1
|
||||
addedObject: {fileID: 802857226}
|
||||
- targetCorrespondingSourceObject: {fileID: 3463712308332304479, guid: 71d12b53bfe275a42b91a98a3e6e2f66, type: 3}
|
||||
insertIndex: -1
|
||||
addedObject: {fileID: 802857229}
|
||||
m_SourcePrefab: {fileID: 100100000, guid: 71d12b53bfe275a42b91a98a3e6e2f66, type: 3}
|
||||
--- !u!114 &508924469 stripped
|
||||
MonoBehaviour:
|
||||
|
|
@ -2127,6 +2182,17 @@ MonoBehaviour:
|
|||
m_Script: {fileID: 11500000, guid: 26b716c41e9b56b4baafaf13a523ba2e, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
--- !u!114 &508924471 stripped
|
||||
MonoBehaviour:
|
||||
m_CorrespondingSourceObject: {fileID: 9091365521926218355, guid: 71d12b53bfe275a42b91a98a3e6e2f66, type: 3}
|
||||
m_PrefabInstance: {fileID: 508924468}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 802857222}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 624abc0263964a90b146b5a469faec83, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
--- !u!1 &520835285
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -3630,12 +3696,11 @@ MonoBehaviour:
|
|||
m_Script: {fileID: 11500000, guid: 624abc0263964a90b146b5a469faec83, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
_componentIndexCache: 1
|
||||
_componentIndexCache: 2
|
||||
_addedNetworkObject: {fileID: 508924470}
|
||||
_networkObjectCache: {fileID: 508924470}
|
||||
sceneName: FarmMap
|
||||
SceneStack: 0
|
||||
spawnPosition: {x: 30, y: 30, z: 0}
|
||||
spawnPosition: {x: 30, y: -30, z: 0}
|
||||
--- !u!114 &802857226
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -3648,10 +3713,62 @@ MonoBehaviour:
|
|||
m_Script: {fileID: 11500000, guid: c71fd7f855ec523429999fc4e14a1928, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
_overrideType: 2
|
||||
_overrideType: 3
|
||||
_updateHostVisibility: 1
|
||||
_observerConditions:
|
||||
- {fileID: 11400000, guid: 2033f54fd2794464bae08fa5a55c8996, type: 2}
|
||||
--- !u!212 &802857229
|
||||
SpriteRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 802857222}
|
||||
m_Enabled: 1
|
||||
m_CastShadows: 0
|
||||
m_ReceiveShadows: 0
|
||||
m_DynamicOccludee: 1
|
||||
m_StaticShadowCaster: 0
|
||||
m_MotionVectors: 1
|
||||
m_LightProbeUsage: 1
|
||||
m_ReflectionProbeUsage: 1
|
||||
m_RayTracingMode: 0
|
||||
m_RayTraceProcedural: 0
|
||||
m_RenderingLayerMask: 1
|
||||
m_RendererPriority: 0
|
||||
m_Materials:
|
||||
- {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2}
|
||||
m_StaticBatchInfo:
|
||||
firstSubMesh: 0
|
||||
subMeshCount: 0
|
||||
m_StaticBatchRoot: {fileID: 0}
|
||||
m_ProbeAnchor: {fileID: 0}
|
||||
m_LightProbeVolumeOverride: {fileID: 0}
|
||||
m_ScaleInLightmap: 1
|
||||
m_ReceiveGI: 1
|
||||
m_PreserveUVs: 0
|
||||
m_IgnoreNormalsForChartDetection: 0
|
||||
m_ImportantGI: 0
|
||||
m_StitchLightmapSeams: 1
|
||||
m_SelectedEditorRenderState: 0
|
||||
m_MinimumChartSize: 4
|
||||
m_AutoUVMaxDistance: 0.5
|
||||
m_AutoUVMaxAngle: 89
|
||||
m_LightmapParameters: {fileID: 0}
|
||||
m_SortingLayerID: 0
|
||||
m_SortingLayer: 0
|
||||
m_SortingOrder: 0
|
||||
m_Sprite: {fileID: -1244154544, guid: ac70ce904d41b844db3b71749443b7dd, type: 3}
|
||||
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_FlipX: 0
|
||||
m_FlipY: 0
|
||||
m_DrawMode: 0
|
||||
m_Size: {x: 1, y: 1}
|
||||
m_AdaptiveModeThreshold: 0.5
|
||||
m_SpriteTileMode: 0
|
||||
m_WasSpriteAssigned: 1
|
||||
m_MaskInteraction: 0
|
||||
m_SpriteSortPoint: 0
|
||||
--- !u!1 &804445073
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
|
|||
|
|
@ -8,9 +8,7 @@ using UnityEngine;
|
|||
|
||||
namespace Managers
|
||||
{
|
||||
public class GameManager : NetworkBehaviour
|
||||
{
|
||||
public enum GameState
|
||||
public enum GameStatus
|
||||
{
|
||||
WaitingForPlayers,
|
||||
Playing,
|
||||
|
|
@ -18,21 +16,24 @@ namespace Managers
|
|||
GameOver
|
||||
}
|
||||
|
||||
|
||||
public class GameManager : NetworkBehaviour
|
||||
{
|
||||
[SerializeField] private SaveManager saveManager;
|
||||
[SerializeField] private HotkeyManager hotkeyManager;
|
||||
[SerializeField] private AudioManager audioManager;
|
||||
[SerializeField] private UIManager uiManager;
|
||||
|
||||
public GameState currentState = GameState.WaitingForPlayers;
|
||||
|
||||
// person who's running the game, owner.
|
||||
[SerializeField] private PlayerManager gameManagerPlayer;
|
||||
[SerializeField] private List<PlayerManager> gameManagerPlayerData;
|
||||
// [SerializeField] private List<PlayerManager> gameManagerPlayerData;
|
||||
|
||||
|
||||
[SerializeField] public ItemDatabase itemDatabase;
|
||||
private readonly SyncList<GamePlayer> _players = new();
|
||||
|
||||
// int = clientID
|
||||
[SerializeField] private readonly SyncDictionary<int, GamePlayer> _players = new();
|
||||
|
||||
public readonly SyncVar<GameStatus> gameStatus = new(GameStatus.WaitingForPlayers);
|
||||
|
||||
public static GameManager Instance { get; set; }
|
||||
|
||||
|
|
@ -43,6 +44,7 @@ namespace Managers
|
|||
itemDatabase = Resources.Load<ItemDatabase>("GameItems/ItemDatabase");
|
||||
|
||||
_players.OnChange += OnPlayersChange;
|
||||
gameStatus.OnChange += OnStatusChange;
|
||||
|
||||
if (Instance != null) Destroy(this);
|
||||
Instance = this;
|
||||
|
|
@ -56,11 +58,21 @@ namespace Managers
|
|||
Debug.Log("GameManager destroyed");
|
||||
}
|
||||
|
||||
private void OnPlayersChange(SyncListOperation op, int index, GamePlayer olditem, GamePlayer newitem,
|
||||
bool asserver)
|
||||
private void OnStatusChange(GameStatus prev, GameStatus next, bool asServer)
|
||||
{
|
||||
Debug.Log("Current Game Status changed: " + prev + " -> " + next);
|
||||
}
|
||||
|
||||
private void OnCurrentStateChange(GameState prev, GameState next, bool asserver)
|
||||
{
|
||||
Debug.Log("Current Game State changed: " + prev + " -> " + next);
|
||||
}
|
||||
|
||||
private void OnPlayersChange(SyncDictionaryOperation op, int clientId,
|
||||
GamePlayer newPlayer, bool asServer)
|
||||
{
|
||||
// log changes
|
||||
Debug.Log($"Players changed: {op} {index} {olditem} {newitem} {asserver}");
|
||||
Debug.Log($"Players changed: {op} {clientId} {newPlayer} {asServer}");
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -68,9 +80,11 @@ namespace Managers
|
|||
public void RegisterPlayerServerRpc(NetworkConnection conn, GamePlayer player)
|
||||
{
|
||||
Debug.Log("Registering player...");
|
||||
if (player != null && !_players.Contains(player))
|
||||
|
||||
if (player != null && !_players.ContainsKey(conn.ClientId))
|
||||
{
|
||||
_players.Add(player);
|
||||
_players.Add(conn.ClientId, player);
|
||||
_players.Dirty(conn.ClientId);
|
||||
Debug.Log($"Player registered: {conn.ClientId}");
|
||||
OnPlayerRegisteredObserversRpc(conn.ClientId);
|
||||
}
|
||||
|
|
@ -83,9 +97,9 @@ namespace Managers
|
|||
// You can add any client-side logic here when a new player joins
|
||||
}
|
||||
|
||||
public List<GamePlayer> GetPlayers()
|
||||
public Dictionary<int, GamePlayer> GetPlayers()
|
||||
{
|
||||
return new List<GamePlayer>(_players);
|
||||
return new Dictionary<int, GamePlayer>(_players);
|
||||
} // ReSharper disable Unity.PerformanceAnalysis
|
||||
public override void OnStartNetwork()
|
||||
{
|
||||
|
|
@ -103,7 +117,13 @@ namespace Managers
|
|||
{
|
||||
// Server logic for new player connections
|
||||
}
|
||||
// client logic for new player connections
|
||||
}
|
||||
|
||||
|
||||
// get player by client id
|
||||
public GamePlayer GetPlayer(int clientId)
|
||||
{
|
||||
return _players[clientId];
|
||||
}
|
||||
|
||||
public override void OnStopClient()
|
||||
|
|
@ -161,17 +181,8 @@ namespace Managers
|
|||
|
||||
public void AddPlayer(GamePlayer gamePlayer)
|
||||
{
|
||||
_players.Add(gamePlayer);
|
||||
}
|
||||
|
||||
public GamePlayer GetCurrentPlayerManager(int id)
|
||||
{
|
||||
return _players[id];
|
||||
}
|
||||
|
||||
public GamePlayer GetLastPlayer()
|
||||
{
|
||||
return _players[^1];
|
||||
_players.Add(Owner.ClientId, gamePlayer);
|
||||
_players.Dirty(Owner.ClientId);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -9,7 +9,7 @@ public interface IItemManager<TSlot> where TSlot : GameSlot
|
|||
void RemoveItemFromSlot(int slotId);
|
||||
void AddItemToOpenSlot(GameItem item);
|
||||
void AddItemToSlot(GameItem item, int slotId);
|
||||
void AddSlot(TSlot slot);
|
||||
void AddSlotServerRpc(TSlot slot);
|
||||
void RemoveSlot(int slotId);
|
||||
TSlot GetSlot(int slotId);
|
||||
void SwapItems(int slotId1, int slotId2);
|
||||
|
|
|
|||
|
|
@ -77,7 +77,7 @@ namespace Managers.Item
|
|||
return ActiveBoxInteractable.Slots.GetValueOrDefault(slotId, null);
|
||||
}
|
||||
|
||||
public void AddSlot(GameSlot gameSlot)
|
||||
public void AddSlotServerRpc(GameSlot gameSlot)
|
||||
{
|
||||
ActiveBoxInteractable.AddSlot(gameSlot);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -46,7 +46,7 @@ namespace Managers.Item
|
|||
(slot1.Item, slot2.Item) = (slot2.Item, slot1.Item);
|
||||
}
|
||||
|
||||
public void AddSlot(GameSlot gameSlot)
|
||||
public void AddSlotServerRpc(GameSlot gameSlot)
|
||||
{
|
||||
Slots[gameSlot.Position] = gameSlot;
|
||||
}
|
||||
|
|
@ -144,7 +144,7 @@ namespace Managers.Item
|
|||
// clear existing slots
|
||||
Slots.Clear();
|
||||
ActiveGameSlot = null;
|
||||
foreach (var slot in slots) AddSlot(slot.Value);
|
||||
foreach (var slot in slots) AddSlotServerRpc(slot.Value);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -56,7 +56,7 @@ namespace Managers.Item
|
|||
throw new NotImplementedException();
|
||||
}
|
||||
|
||||
public void AddSlot(GameSlot gameSlot)
|
||||
public void AddSlotServerRpc(GameSlot gameSlot)
|
||||
{
|
||||
throw new NotImplementedException();
|
||||
}
|
||||
|
|
|
|||
|
|
@ -20,6 +20,7 @@ namespace Managers.Item
|
|||
|
||||
private readonly SlotType _slotType = SlotType.Toolbar;
|
||||
|
||||
|
||||
private void Awake()
|
||||
{
|
||||
_slots.OnChange += slots_OnChange;
|
||||
|
|
@ -60,13 +61,21 @@ namespace Managers.Item
|
|||
}
|
||||
|
||||
|
||||
public void AddSlot(string position, GameSlot gameSlot)
|
||||
[ServerRpc]
|
||||
public void AddSlotServerRpc(GameSlot gameSlot)
|
||||
{
|
||||
// get max slot position
|
||||
var maxSlotPosition = 0;
|
||||
foreach (var slot in _slots.Values)
|
||||
if (slot.Position > maxSlotPosition)
|
||||
maxSlotPosition = slot.Position;
|
||||
gameSlot.Position = maxSlotPosition + 1;
|
||||
gameSlot.SlotType = _slotType;
|
||||
_slots[gameSlot.Position] = position;
|
||||
_slots[gameSlot.GetId()] = gameSlot;
|
||||
_slots.Dirty(gameSlot.Position);
|
||||
}
|
||||
|
||||
|
||||
public void RemoveSlot(int slotId)
|
||||
{
|
||||
_slots.Remove(slotId);
|
||||
|
|
@ -85,6 +94,7 @@ namespace Managers.Item
|
|||
}
|
||||
|
||||
|
||||
[ServerRpc]
|
||||
public void AddItemToSlot(GameItem item, int slotId)
|
||||
{
|
||||
if (_slots.TryGetValue(slotId, out var slot))
|
||||
|
|
@ -184,14 +194,37 @@ namespace Managers.Item
|
|||
Debug.Log("Toolbar slots: " + playerData.ToolbarSlots.Count);
|
||||
|
||||
// print all the toolbar slots keys
|
||||
foreach (var slot in playerData.ToolbarSlots) Debug.Log("Slot key: " + slot.Key);
|
||||
// foreach (var slot in playerData.ToolbarSlots) Debug.Log("Slot key: " + slot.Key);
|
||||
|
||||
// create player slots for inventory
|
||||
for (var i = 0; i < playerData.ToolbarSize; i++) AddSlot(playerData.ToolbarSlots[i]);
|
||||
/*for (var i = 0; i < playerData.ToolbarSize; i++)
|
||||
{
|
||||
// find slot at position i and map it
|
||||
var slot = playerData.ToolbarSlots.FirstOrDefault(x => x.Value.Position == i);
|
||||
if (slot.Value != null) AddSlotServerRpc(slot.Value);
|
||||
}*/
|
||||
// copy slots from Dictionary to SyncDictionary
|
||||
|
||||
Debug.Log("Completed Initialized hotkeys in ToolbarManager");
|
||||
}
|
||||
|
||||
|
||||
public override void OnStartClient()
|
||||
{
|
||||
base.OnStartClient();
|
||||
}
|
||||
|
||||
|
||||
// on client connected,
|
||||
|
||||
|
||||
// on client, add slot to toolbar
|
||||
[ObserversRpc]
|
||||
public void AddSlotObserversRpc(GameSlot slot)
|
||||
{
|
||||
// AddSlot(slot);
|
||||
}
|
||||
|
||||
public GameSlot GetActiveToolbarSlot()
|
||||
{
|
||||
return _activeGameSlot.Value;
|
||||
|
|
|
|||
|
|
@ -105,7 +105,8 @@ namespace Managers
|
|||
|
||||
public void OnLoadEnd(SceneLoadEndEventArgs data)
|
||||
{
|
||||
Debug.Log("Scene loaded: " + data.LoadedScenes[0].name);
|
||||
Debug.Log("Scene loaded: " + data.LoadedScenes.Length);
|
||||
/*Debug.Log("Scene loaded: " + data.LoadedScenes[0].name);*/
|
||||
// GridManager.Instance.LoadGrid(currentMap.sceneName, currentMap.gridPosition);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,7 @@
|
|||
using System.Collections;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using Data.ScriptableObjects;
|
||||
using FishNet.Connection;
|
||||
using FishNet.Object;
|
||||
using FishNet.Object.Synchronizing;
|
||||
using Managers.Item;
|
||||
|
|
@ -14,6 +16,9 @@ namespace Managers
|
|||
// Manages a INSTANCE of a single player.
|
||||
public class PlayerManager : NetworkBehaviour
|
||||
{
|
||||
private static readonly Dictionary<int, PlayerManager> _playerManagers = new();
|
||||
|
||||
|
||||
[SerializeField] private InventoryManager inventoryManager;
|
||||
[SerializeField] private ToolbarManager toolbarManager;
|
||||
[SerializeField] private EquipmentManager equipmentManager;
|
||||
|
|
@ -28,49 +33,170 @@ namespace Managers
|
|||
|
||||
private readonly SyncVar<GamePlayer> _playerData = new(new SyncTypeSettings(1f));
|
||||
|
||||
private NetworkConnection _connection;
|
||||
|
||||
private void Awake()
|
||||
{
|
||||
_playerData.OnChange += playerData_OnChange;
|
||||
_connection = null;
|
||||
}
|
||||
|
||||
|
||||
public void SetupCamera()
|
||||
{
|
||||
playerCamera = GetComponentInChildren<Camera>();
|
||||
if (playerCamera == null)
|
||||
{
|
||||
Debug.LogError("No camera found for player");
|
||||
return;
|
||||
}
|
||||
|
||||
playerCamera.enabled = IsOwner;
|
||||
if (IsOwner)
|
||||
{
|
||||
Camera.main.gameObject.SetActive(false);
|
||||
playerCamera.tag = "MainCamera";
|
||||
}
|
||||
}
|
||||
|
||||
public void playerData_OnChange(GamePlayer prev, GamePlayer next, bool asServer)
|
||||
{
|
||||
Debug.Log("PlayerData changed:");
|
||||
if (prev != null) Debug.Log($"PlayerData changed PREV: {prev.ID} {prev.PlayerName} {asServer}");
|
||||
if (next != null) Debug.Log($"PlayerData changed NEXT: {next.ID} {next.PlayerName} {asServer}");
|
||||
if (prev != null)
|
||||
Debug.Log($"PlayerData changed PREV: {prev.ID} {prev.PlayerName} {prev.MoveSpeed} {asServer}");
|
||||
if (next != null)
|
||||
Debug.Log($"PlayerData changed NEXT: {next.ID} {next.PlayerName} {next.MoveSpeed} {asServer}");
|
||||
}
|
||||
|
||||
public override void OnStartServer()
|
||||
{
|
||||
base.OnStartServer();
|
||||
|
||||
// reset player managers
|
||||
_playerManagers.Clear();
|
||||
|
||||
if (gameManager == null) gameManager = FindObjectOfType<GameManager>();
|
||||
if (gameManager == null)
|
||||
{
|
||||
Debug.Log("GameManager not found");
|
||||
Debug.Log("GameManager not found, creating new one");
|
||||
GameInit.Instance.InitializeGameManager();
|
||||
gameManager = FindObjectOfType<GameManager>();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
[ServerRpc]
|
||||
public void SpawnGameManager()
|
||||
public override void OnStartClient()
|
||||
{
|
||||
var gameManagerGo = Instantiate(gameManagerPrefab, transform.position, Quaternion.identity);
|
||||
Spawn(gameManagerGo);
|
||||
gameManager = gameManagerGo.GetComponent<GameManager>();
|
||||
if (gameManager == null) Debug.LogError("GameManager not found");
|
||||
base.OnStartClient();
|
||||
|
||||
//c check if server is active
|
||||
if (!IsServerInitialized)
|
||||
{
|
||||
Debug.LogError("Server is not active");
|
||||
StartCoroutine(WaitForServerAndRegister());
|
||||
return;
|
||||
}
|
||||
|
||||
[ObserversRpc]
|
||||
public void SpawnGameManagerClient(GameManager gameManager)
|
||||
Debug.Log("Total existing playerManagers: " + _playerManagers.Count);
|
||||
|
||||
if (IsOwner)
|
||||
{
|
||||
this.gameManager = gameManager;
|
||||
_connection = Owner;
|
||||
_playerData.Value = GetPlayerData();
|
||||
// StartCoroutine(WaitForClientActiveAndRegister());
|
||||
RegisterPlayer();
|
||||
try
|
||||
{
|
||||
_playerManagers.Add(Owner.ClientId, this);
|
||||
}
|
||||
catch (Exception e)
|
||||
{
|
||||
Debug.LogError(e);
|
||||
Debug.LogError("Failed to add player manager");
|
||||
}
|
||||
}
|
||||
// ... rest of your OnStartClient code ...
|
||||
}
|
||||
|
||||
private IEnumerator WaitForClientActiveAndRegister()
|
||||
private System.Collections.IEnumerator WaitForServerAndRegister() {
|
||||
|
||||
while (!IsServerInitialized)
|
||||
{
|
||||
while (!IsClientInitialized)
|
||||
yield return new WaitForSeconds(0.5f); // Wait a short time to ensure everything is set up
|
||||
}
|
||||
|
||||
Debug.Log("Server is ready");
|
||||
RegisterPlayer();
|
||||
}
|
||||
|
||||
// private IEnumerator WaitForClientActiveAndRegister()
|
||||
// {
|
||||
// yield return new WaitForSeconds(0.5f); // Wait a short time to ensure everything is set up
|
||||
//
|
||||
// while (!gameManager)
|
||||
// {
|
||||
// gameManager = FindObjectOfType<GameManager>();
|
||||
// yield return null;
|
||||
// }
|
||||
//
|
||||
// Debug.Log("Attempting to register player");
|
||||
// RegisterPlayer();
|
||||
// }
|
||||
|
||||
[ServerRpc(RequireOwnership = false)]
|
||||
private void RegisterPlayer()
|
||||
{
|
||||
if (_playerData.Value == null)
|
||||
{
|
||||
Debug.LogWarning("PlayerData not found, loading default");
|
||||
// load a scriptable objects default player data
|
||||
var playerData =
|
||||
AssetDatabase.LoadAssetAtPath<GamePlayerSo>("Assets/Resources/DefaultPlayer.asset");
|
||||
|
||||
_playerData.Value = new GamePlayer(playerData)
|
||||
{
|
||||
PlayerName = "Player " + Owner.ClientId,
|
||||
ID = Guid.NewGuid()
|
||||
};
|
||||
}
|
||||
|
||||
|
||||
if (gameManager != null && _playerData.Value != null)
|
||||
{
|
||||
Debug.Log("Calling RegisterPlayerServerRpc");
|
||||
gameManager.RegisterPlayerServerRpc(Owner, _playerData.Value);
|
||||
}
|
||||
else
|
||||
{
|
||||
Debug.LogError(
|
||||
$"Failed to register player. GameManager null: {gameManager == null}, PlayerData null: {_playerData.Value == null}");
|
||||
}
|
||||
}
|
||||
|
||||
public GameObject GetPlayerGo()
|
||||
{
|
||||
return playerGo;
|
||||
}
|
||||
|
||||
public GamePlayer GetPlayerData()
|
||||
{
|
||||
return _playerData.Value;
|
||||
}
|
||||
|
||||
|
||||
public static PlayerManager GetPlayerManager(int clientId)
|
||||
{
|
||||
return _playerManagers[clientId];
|
||||
}
|
||||
|
||||
public Camera GetPlayerCamera()
|
||||
{
|
||||
return playerCamera;
|
||||
}
|
||||
|
||||
/*private IEnumerator WaitForClientActiveAndRegister()
|
||||
{
|
||||
while (!IsClientInitialized && !IsClientStarted)
|
||||
{
|
||||
Debug.Log("Waiting for client to be initialized");
|
||||
yield return null;
|
||||
|
|
@ -80,10 +206,10 @@ namespace Managers
|
|||
if (Owner == null) Debug.LogError("OwnerConnection not found");
|
||||
if (gameManager == null) gameManager = FindObjectOfType<GameManager>();
|
||||
Debug.Log("GameManager should be found");
|
||||
GameManager.Instance.RegisterPlayerServerRpc(Owner, _playerData.Value);
|
||||
}
|
||||
gameManager.RegisterPlayerServerRpc(Owner, _playerData.Value);
|
||||
}*/
|
||||
|
||||
public override void OnStartClient()
|
||||
/*public override void OnStartClient()
|
||||
{
|
||||
base.OnStartClient();
|
||||
|
||||
|
|
@ -124,7 +250,7 @@ namespace Managers
|
|||
if (Owner == null) Debug.LogError("OwnerConnection not found");
|
||||
|
||||
StartCoroutine(WaitForClientActiveAndRegister());
|
||||
// gameManager.RegisterPlayerServerRpc(Owner, this);
|
||||
// gameManager.RegisterPlayerServerRpc(Owner, _playerData.Value);
|
||||
// gameManager.AddPlayer(this);
|
||||
LocalPlayerManager.Instance = this;
|
||||
}
|
||||
|
|
@ -134,16 +260,16 @@ namespace Managers
|
|||
gameObject.GetComponent<PlayerManager>().enabled = false;
|
||||
gameObject.GetComponent<PlayerController>().enabled = false;
|
||||
}
|
||||
}
|
||||
}*/
|
||||
|
||||
|
||||
// should only run on the server, NOT clients
|
||||
[ServerRpc]
|
||||
public void InitializeManager()
|
||||
{
|
||||
inventoryManager = playerGo.AddComponent<InventoryManager>();
|
||||
/*inventoryManager = playerGo.AddComponent<InventoryManager>();
|
||||
toolbarManager = playerGo.AddComponent<ToolbarManager>();
|
||||
equipmentManager = playerGo.AddComponent<EquipmentManager>();
|
||||
equipmentManager = playerGo.AddComponent<EquipmentManager>();*/
|
||||
|
||||
inventoryManager.Initialize(_playerData.Value);
|
||||
toolbarManager.Initialize(_playerData.Value);
|
||||
|
|
@ -240,10 +366,6 @@ namespace Managers
|
|||
// inventoryManager.AddItemToOpenSlot(item);
|
||||
}
|
||||
|
||||
public GamePlayer GetPlayerData()
|
||||
{
|
||||
return _playerData.Value;
|
||||
}
|
||||
|
||||
[ServerRpc]
|
||||
public void SetPlayerData(GamePlayer pd)
|
||||
|
|
|
|||
|
|
@ -57,7 +57,7 @@ public class PlayerController : NetworkBehaviour
|
|||
ReadPermission = ReadPermission.Observers
|
||||
});
|
||||
|
||||
[SerializeField] private GamePlayer player;
|
||||
[SerializeField] private GamePlayer _player;
|
||||
|
||||
private void Awake()
|
||||
{
|
||||
|
|
@ -69,12 +69,15 @@ public class PlayerController : NetworkBehaviour
|
|||
if (IsServerInitialized) _serverPosition.Value = transform.position;
|
||||
|
||||
if (playerManager == null) playerManager = GetComponent<PlayerManager>();
|
||||
_player = playerManager.GetPlayerData();
|
||||
}
|
||||
|
||||
// Update is called once per frame
|
||||
private void Update()
|
||||
{
|
||||
if (!IsOwner) return;
|
||||
if (_player == null) _player = playerManager.GetPlayerData();
|
||||
if (_player == null) return;
|
||||
|
||||
var moveInput = new Vector2(Input.GetAxisRaw("Horizontal"), Input.GetAxisRaw("Vertical"));
|
||||
moveInput.Normalize();
|
||||
|
|
@ -203,15 +206,15 @@ public class PlayerController : NetworkBehaviour
|
|||
|
||||
private void OnCollisionEnter2D(Collision2D collision)
|
||||
{
|
||||
if (collision.gameObject.CompareTag("Enemy") && !player.IsKnockedBack)
|
||||
if (collision.gameObject.CompareTag("Enemy") && !_player.IsKnockedBack)
|
||||
{
|
||||
// healthCount--;
|
||||
|
||||
// Calculate the knockback direction
|
||||
player.KnockbackDirection = (transform.position - collision.transform.position).normalized;
|
||||
_player.KnockbackDirection = (transform.position - collision.transform.position).normalized;
|
||||
|
||||
// Set the knockback flag
|
||||
player.IsKnockedBack = true;
|
||||
_player.IsKnockedBack = true;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -219,7 +222,7 @@ public class PlayerController : NetworkBehaviour
|
|||
private void MovePlayerServerRpc(Vector2 moveInput)
|
||||
{
|
||||
// _serverVelocity.Value = moveInput * moveSpeed;
|
||||
// rb2d.velocity = moveInput * moveSpeed;
|
||||
// rb2d.velocity = moveInput * _player.MoveSpeed;
|
||||
// _serverPosition.Value = rb2d.position + rb2d.velocity * Time.deltaTime;
|
||||
// transform.position = rb2d.position + rb2d.velocity * Time.deltaTime;
|
||||
SyncMovementObserversRpc(moveInput);
|
||||
|
|
@ -244,30 +247,30 @@ public class PlayerController : NetworkBehaviour
|
|||
faceL.SetActive(false);
|
||||
faceD.SetActive(false);
|
||||
faceU.SetActive(false);
|
||||
player.MovingDown = false;
|
||||
player.MovingLeft = false;
|
||||
player.MovingRight = false;
|
||||
player.MovingUp = false;
|
||||
_player.MovingDown = false;
|
||||
_player.MovingLeft = false;
|
||||
_player.MovingRight = false;
|
||||
_player.MovingUp = false;
|
||||
|
||||
switch (activeDir)
|
||||
{
|
||||
case "right":
|
||||
player.MovingRight = true;
|
||||
_player.MovingRight = true;
|
||||
faceR.SetActive(true);
|
||||
playerAnimations.Play("walkR");
|
||||
break;
|
||||
case "down":
|
||||
player.MovingDown = true;
|
||||
_player.MovingDown = true;
|
||||
faceD.SetActive(true);
|
||||
playerAnimations.Play("walkD");
|
||||
break;
|
||||
case "up":
|
||||
player.MovingUp = true;
|
||||
_player.MovingUp = true;
|
||||
faceU.SetActive(true);
|
||||
playerAnimations.Play("walkU");
|
||||
break;
|
||||
case "left":
|
||||
player.MovingLeft = true;
|
||||
_player.MovingLeft = true;
|
||||
faceL.SetActive(true);
|
||||
playerAnimations.Play("walkL");
|
||||
break;
|
||||
|
|
@ -511,13 +514,17 @@ public PlayerData GetPlayerData()
|
|||
[ObserversRpc]
|
||||
private void SyncMovementObserversRpc(Vector2 moveInput)
|
||||
{
|
||||
Debug.Log("Syncing movement...");
|
||||
// Debug.Log("Syncing movement...");
|
||||
// if (IsOwner) return;
|
||||
|
||||
rb2d.velocity = moveInput * player.MoveSpeed;
|
||||
// Updates non-owned clients
|
||||
transform.position += (Vector3)(moveInput * (player.MoveSpeed * Time.deltaTime));
|
||||
// rb2d.velocity = player.moveInput * player.moveSpeed;
|
||||
if (_player == null)
|
||||
{
|
||||
_player = playerManager.GetPlayerData();
|
||||
return;
|
||||
}
|
||||
|
||||
rb2d.velocity = moveInput * _player.MoveSpeed;
|
||||
// transform.position += (Vector3)(moveInput * (_player.MoveSpeed * Time.deltaTime));
|
||||
}
|
||||
|
||||
/*[ServerRpc]
|
||||
|
|
|
|||
|
|
@ -1,19 +1,26 @@
|
|||
using System.Collections;
|
||||
using System.Collections.Generic;
|
||||
using FishNet;
|
||||
using FishNet.Connection;
|
||||
using FishNet.Managing.Scened;
|
||||
using FishNet.Object;
|
||||
using Managers;
|
||||
using UnityEngine;
|
||||
using UnityEngine.EventSystems;
|
||||
|
||||
public class SceneLoader : NetworkBehaviour, IPointerClickHandler
|
||||
{
|
||||
private static Dictionary<int, string> playerScenes = new();
|
||||
[SerializeField] private string sceneName;
|
||||
[SerializeField] public bool SceneStack;
|
||||
[SerializeField] private Vector3 spawnPosition;
|
||||
|
||||
|
||||
private int _stackedSceneHandle;
|
||||
|
||||
private void Awake()
|
||||
{
|
||||
// InstanceFinder.NetworkManager.SceneManager.AddOwnerToDefaultScene(GetComponent<NetworkObject>());
|
||||
}
|
||||
|
||||
private void Start()
|
||||
{
|
||||
InstanceFinder.SceneManager.OnLoadEnd += SceneManager_OnLoadEnd;
|
||||
|
|
@ -25,26 +32,45 @@ public class SceneLoader : NetworkBehaviour, IPointerClickHandler
|
|||
InstanceFinder.SceneManager.OnLoadEnd -= SceneManager_OnLoadEnd;
|
||||
}
|
||||
|
||||
|
||||
private void OnTriggerEnter(Collider other)
|
||||
private void OnCollisionEnter(Collision collision)
|
||||
{
|
||||
var nob = other.GetComponent<NetworkObject>();
|
||||
if (nob != null && nob.IsOwner) LoadScene(nob);
|
||||
Debug.Log("OnCollisionEnter triggered");
|
||||
}
|
||||
|
||||
|
||||
private void OnTriggerEnter2D(Collider2D other)
|
||||
{
|
||||
Debug.Log("OnTriggerEnter triggered");
|
||||
if (!IsServerInitialized) return;
|
||||
|
||||
|
||||
Debug.Log("On Trigger ENTEREED");
|
||||
var nob = other.gameObject.GetComponent<NetworkObject>();
|
||||
// Debug.Log("Player with clientID " + other.gameObject.GetInstanceID() + " entered trigger");
|
||||
var otherConnection = other.GetComponent<NetworkObject>().Owner;
|
||||
Debug.Log("Player with clientID " + otherConnection.ClientId + " entered trigger");
|
||||
if (nob != null) LoadScene(InstanceFinder.ClientManager.Connection.ClientId);
|
||||
}
|
||||
|
||||
public void OnPointerClick(PointerEventData eventData)
|
||||
{
|
||||
/*if (!IsOwner)
|
||||
{
|
||||
Debug.Log("Not local player owner, not loading scene");
|
||||
return;
|
||||
}*/
|
||||
|
||||
Debug.Log("Clicked scene loader");
|
||||
var nob = eventData.pointerCurrentRaycast.gameObject.GetComponent<NetworkObject>();
|
||||
if (nob != null) LoadScene(nob);
|
||||
|
||||
var clientId = InstanceFinder.ClientManager.Connection.ClientId;
|
||||
Debug.Log("Player with clientID " + clientId + " clicked scene loader");
|
||||
LoadScene(clientId);
|
||||
}
|
||||
|
||||
private void SceneManager_OnLoadEnd(SceneLoadEndEventArgs data)
|
||||
{
|
||||
if (!data.QueueData.AsServer)
|
||||
return;
|
||||
if (!SceneStack)
|
||||
return;
|
||||
if (_stackedSceneHandle != 0)
|
||||
return;
|
||||
|
||||
|
|
@ -53,44 +79,110 @@ public class SceneLoader : NetworkBehaviour, IPointerClickHandler
|
|||
}
|
||||
|
||||
|
||||
private void LoadScene(NetworkObject nob)
|
||||
public override void OnStartServer()
|
||||
{
|
||||
Debug.Log("SceneLoader OnStartServer");
|
||||
|
||||
base.OnStartServer();
|
||||
|
||||
var networkObject = GetComponent<NetworkObject>();
|
||||
if (networkObject != null) networkObject.GiveOwnership(NetworkManager.ServerManager.Clients[0]);
|
||||
}
|
||||
|
||||
|
||||
[ServerRpc(RequireOwnership = false)]
|
||||
private void LoadScene(int clientId)
|
||||
{
|
||||
Debug.Log("Loading scene");
|
||||
var sceneLoadData = new SceneLoadData(SceneLookupData.CreateData(sceneName));
|
||||
sceneLoadData.ReplaceScenes = ReplaceOption.None;
|
||||
sceneLoadData.Options.AllowStacking = true;
|
||||
sceneLoadData.ReplaceScenes = ReplaceOption.All;
|
||||
sceneLoadData.Options.AllowStacking = false;
|
||||
|
||||
var connection = nob.Owner;
|
||||
InstanceFinder.SceneManager.LoadConnectionScenes(InstanceFinder.ClientManager.Connection, sceneLoadData);
|
||||
InstanceFinder.SceneManager.UnloadConnectionScenes(InstanceFinder.ClientManager.Connection,
|
||||
new SceneUnloadData("StartMenu"));
|
||||
|
||||
InstanceFinder.SceneManager.LoadConnectionScenes(nob.Owner, sceneLoadData);
|
||||
MovePlayerToSpawnPositionServerRpc(connection);
|
||||
// move player to spawn position
|
||||
}
|
||||
|
||||
[ServerRpc(RequireOwnership = false)]
|
||||
private void MovePlayerToSpawnPositionServerRpc(NetworkConnection connection)
|
||||
{
|
||||
Debug.Log("Moving player to spawn position (SERVERRPC)");
|
||||
StartCoroutine(MovePlayerToSpawnPosition(connection));
|
||||
}
|
||||
|
||||
private IEnumerator MovePlayerToSpawnPosition(NetworkConnection connection)
|
||||
{
|
||||
// yield return new WaitForEndOfFrame();
|
||||
yield return new WaitForSeconds(0.5f);
|
||||
// Debug.Log("Moving player to spawn position for clientId" + clientId);
|
||||
// MovePlayerToSpawnPositionServerRpc(clientId);
|
||||
// StartCoroutine(MovePlayerToSpawnPosition(clientId));
|
||||
|
||||
var player = PlayerManager.GetPlayerManager(clientId).GetPlayerGo();
|
||||
var playerCamera = PlayerManager.GetPlayerManager(clientId).GetPlayerCamera();
|
||||
// get players network object
|
||||
var player = connection.FirstObject;
|
||||
|
||||
if (player != null)
|
||||
if (player == null)
|
||||
{
|
||||
Debug.Log("Moving player to spawn position");
|
||||
Debug.LogError("Player is null, can not move player to spawn position");
|
||||
return;
|
||||
}
|
||||
|
||||
Debug.Log("Moving player to spawn position: " + spawnPosition);
|
||||
player.transform.position = spawnPosition;
|
||||
|
||||
UpdatePlayerPositionObserversRpc(player.ObjectId, spawnPosition);
|
||||
playerCamera.gameObject.SetActive(true);
|
||||
// if (Camera.main != null) Camera.main.gameObject.SetActive(false);
|
||||
// playerCamera.gameObject.SetActive(true);
|
||||
|
||||
UpdatePlayerPositionObserversRpc(player.gameObject.GetInstanceID(), spawnPosition);
|
||||
// SetupPlayerCameraObserversRpc(clientId);
|
||||
}
|
||||
|
||||
[ObserversRpc]
|
||||
private void SetupPlayerCameraObserversRpc(int clientId)
|
||||
{
|
||||
var playerManager = PlayerManager.GetPlayerManager(clientId);
|
||||
if (playerManager == null) return;
|
||||
var playerGo = playerManager.GetPlayerGo();
|
||||
if (playerGo == null) return;
|
||||
|
||||
var camera = playerGo.GetComponentInChildren<Camera>();
|
||||
if (camera == null) return;
|
||||
|
||||
// enable camera only for the local playerf
|
||||
if (playerManager.IsOwner)
|
||||
{
|
||||
camera.enabled = true;
|
||||
Camera.main.gameObject.SetActive(false);
|
||||
camera.tag = "MainCamera";
|
||||
}
|
||||
else
|
||||
{
|
||||
camera.enabled = false;
|
||||
}
|
||||
|
||||
playerManager.SetupCamera();
|
||||
}
|
||||
|
||||
// [ServerRpc(RequireOwnership = false)]
|
||||
// private void MovePlayerToSpawnPositionServerRpc(int clientId)
|
||||
// {
|
||||
// Debug.Log("Preparing to move player to spawn position (SERVERRPC) for clientId " + clientId);
|
||||
// StartCoroutine(MovePlayerToSpawnPosition(clientId));
|
||||
// }
|
||||
|
||||
// private IEnumerator MovePlayerToSpawnPosition(int clientId)
|
||||
// {
|
||||
// // yield return new WaitForEndOfFrame();
|
||||
// // wait until the scence is finished loading
|
||||
// // yield return new WaitUntil(() => InstanceFinder.SceneManager
|
||||
// yield return new WaitForSeconds(0.5f); // Wait a short time to ensure everything is set up
|
||||
//
|
||||
// var player = PlayerManager.GetPlayerManager(clientId).GetPlayerGo();
|
||||
// // get players network object
|
||||
//
|
||||
// if (player == null)
|
||||
// {
|
||||
// Debug.LogError("Player is null, can not move player to spawn position");
|
||||
// yield return null;
|
||||
// }
|
||||
//
|
||||
// if (player != null)
|
||||
// {
|
||||
// Debug.Log("Moving player to spawn position: " + spawnPosition);
|
||||
// player.transform.position = spawnPosition;
|
||||
//
|
||||
// UpdatePlayerPositionObserversRpc(player.gameObject.GetInstanceID(), spawnPosition);
|
||||
// }
|
||||
// }
|
||||
|
||||
// Get all scenes loaded for this connection
|
||||
[ServerRpc(RequireOwnership = false)]
|
||||
|
|
|
|||
|
|
@ -11,7 +11,6 @@ namespace Types
|
|||
{
|
||||
public int Attack;
|
||||
public float AttackCoolDownTime;
|
||||
|
||||
public bool Attacking;
|
||||
|
||||
public string CurrentMap;
|
||||
|
|
@ -89,6 +88,8 @@ namespace Types
|
|||
Magic = gamePlayerData.magic;
|
||||
Sanity = gamePlayerData.sanity;
|
||||
MaxSanity = gamePlayerData.maxSanity;
|
||||
MoveSpeed = gamePlayerData.moveSpeed;
|
||||
ID = gamePlayerData.ID;
|
||||
|
||||
EquipmentSlots = gamePlayerData.EquipmentSlots;
|
||||
|
||||
|
|
@ -97,10 +98,6 @@ namespace Types
|
|||
ToolbarSlots = gamePlayerData.ToolbarSlots;
|
||||
}
|
||||
|
||||
public GamePlayer(Dictionary<int, GameSlot> toolbarSlots)
|
||||
{
|
||||
ToolbarSlots = toolbarSlots;
|
||||
}
|
||||
|
||||
/*public void OnEnable()
|
||||
{
|
||||
|
|
|
|||
|
|
@ -37,6 +37,10 @@ namespace Types.UI
|
|||
IsLocked = false;
|
||||
}
|
||||
|
||||
public GameSlot(GameSlot slotValue)
|
||||
{
|
||||
}
|
||||
|
||||
public SlotType GetSlotType()
|
||||
{
|
||||
return SlotType;
|
||||
|
|
|
|||
|
|
@ -1,5 +1,6 @@
|
|||
{
|
||||
"dependencies": {
|
||||
"com.firstgeargames.fishnet": "https://github.com/FirstGearGames-Org/FishNet_Supporters.git?path=Assets/FishNet",
|
||||
"com.unity.cinemachine": "2.10.0",
|
||||
"com.unity.collab-proxy": "2.4.3",
|
||||
"com.unity.feature.2d": "2.0.1",
|
||||
|
|
|
|||
|
|
@ -1,5 +1,14 @@
|
|||
{
|
||||
"dependencies": {
|
||||
"com.firstgeargames.fishnet": {
|
||||
"version": "https://github.com/FirstGearGames-Org/FishNet_Supporters.git?path=Assets/FishNet",
|
||||
"depth": 0,
|
||||
"source": "git",
|
||||
"dependencies": {
|
||||
"com.unity.nuget.newtonsoft-json": "3.2.1"
|
||||
},
|
||||
"hash": "90d338d35c4edfb1758933f5a3fefcb22e427542"
|
||||
},
|
||||
"com.seanba.super-tiled2unity": {
|
||||
"version": "file:super-tiled2unity.v2.2.0",
|
||||
"depth": 0,
|
||||
|
|
@ -107,7 +116,7 @@
|
|||
"url": "https://packages.unity.com"
|
||||
},
|
||||
"com.unity.burst": {
|
||||
"version": "1.8.16",
|
||||
"version": "1.8.15",
|
||||
"depth": 1,
|
||||
"source": "registry",
|
||||
"dependencies": {
|
||||
|
|
|
|||
|
|
@ -27,7 +27,7 @@ EditorSettings:
|
|||
m_EnterPlayModeOptionsEnabled: 1
|
||||
m_EnterPlayModeOptions: 3
|
||||
m_GameObjectNamingDigits: 1
|
||||
m_GameObjectNamingScheme: 0
|
||||
m_GameObjectNamingScheme: 2
|
||||
m_AssetNamingUsesSpace: 1
|
||||
m_InspectorUseIMGUIDefaultInspector: 0
|
||||
m_UseLegacyProbeSampleCount: 0
|
||||
|
|
|
|||
|
|
@ -1,2 +1,2 @@
|
|||
m_EditorVersion: 2022.3.36f1
|
||||
m_EditorVersionWithRevision: 2022.3.36f1 (95a4219250e5)
|
||||
m_EditorVersion: 2022.3.31f1
|
||||
m_EditorVersionWithRevision: 2022.3.31f1 (4ede2d13e8b4)
|
||||
|
|
|
|||
|
|
@ -0,0 +1,794 @@
|
|||
#
|
||||
# A fatal error has been detected by the Java Runtime Environment:
|
||||
#
|
||||
# EXCEPTION_ACCESS_VIOLATION (0xc0000005) at pc=0x00007ffc26b23582, pid=22460, tid=32152
|
||||
#
|
||||
# JRE version: OpenJDK Runtime Environment JBR-21.0.3+13-509.4-jcef (21.0.3+13) (build 21.0.3+13-b509.4)
|
||||
# Java VM: OpenJDK 64-Bit Server VM JBR-21.0.3+13-509.4-jcef (21.0.3+13-b509.4, mixed mode, tiered, compressed oops, compressed class ptrs, g1 gc, windows-amd64)
|
||||
# Problematic frame:
|
||||
# V [jvm.dll+0x733582]
|
||||
#
|
||||
# No core dump will be written. Minidumps are not enabled by default on client versions of Windows
|
||||
#
|
||||
# If you would like to submit a bug report, please visit:
|
||||
# https://youtrack.jetbrains.com/issues/JBR
|
||||
#
|
||||
|
||||
--------------- S U M M A R Y ------------
|
||||
|
||||
Command Line: -Djava.io.tmpdir=C:\Users\Dane Miller\AppData\Local\JetBrains\Rider2024.2\tmp\statistics-uploader com.intellij.internal.statistic.uploader.EventLogUploader --ide-token C:\Users\Dane Miller\AppData\Local\JetBrains\Rider2024.2\token --recorders MLSE;FUS;MP;IJ_MAP;ML --device-mlse 080724136b469d9-f004-45dd-9a33-fc9c139518a7 --bucket-mlse 250 --machine-mlse 39000c1408aca13ea15e72b100d97d005acf511b106e6b9f76428957b22ec297 --id-revision-mlse 0 --files-mlse C:\Users\Dane Miller\AppData\Local\JetBrains\Rider2024.2\event-log-data\logs\MLSE\5d7a-4f98-992d-d52cf709442a-242.19890.25-eap.log;C:\Users\Dane Miller\AppData\Local\JetBrains\Rider2024.2\event-log-data\logs\MLSE\7e03-4461-be3c-5eabe7f331f0-242.19890.25-eap.log --escape-mlse true --device-fus 02052413dcabcdb-1556-4ca6-adcc-6b807e280d56 --bucket-fus 161 --machine-fus eedbb782e320b4037fc38827ddb3b1faec6645f615308fbf4c1c0699c6164ef7 --id-revision-fus 0 --files-fus C:\Users\Dane Miller\AppData\Local\JetBrains\Rider2024.2\event-log-data\logs\FUS\0951-45db-bb4c-14a7b8d20f03-242.19890.25-eap.log;C:\Users\Dane Miller\AppData\Local\JetBrains\Rider2024.2\event-log-data\logs\FUS\21a9-488f-b0d8-8d92d8132570-242.19890.25-eap.log;C:\Users\Dane Miller\AppData\Local\JetBrains\Rider2024.2\event-log-data\logs\FUS\2c51-4bdc-bbd7-aad442979a7a-242.19890.25-eap.log;C:\Users\Dane Miller\AppData\Local\JetBrains\Rider2024.2\event-log-data\logs\FUS\3d2d-4431-8e64-2a9ad75aa8c9-242.19890.25-eap.log;C:\Users\Dane Miller\AppData\Local\JetBrains\Rider2024.2\event-log-data\logs\FUS\480b-4037-b9a5-928d67a0dbea-242.19890.25-eap.log --escape-fus true --device-mp 02052412f99d35d-0f16-4a52-9de8-9c105a40ede0 --bucket-mp 6 --machine-mp c2686f73dec193db99140ae531da40a49840cf0973d73822b970be502d4ca3ee --id-revision-mp 0 --files-mp C:\Users\Dane Miller\AppData\Local\JetBrains\Rider2024.2\event-log-data\logs\MP\7744-4e52-84c1-90077ae93329-242.19890.25-eap.log;C:\Users\Dane Miller\AppData\Local\JetBrains\Rider2024.2\event-log-data\logs\MP\dd31-4033-9767-1ae238ed199f-242.19890.25-eap.log --escape-mp true --device-ij_map 08072415eb3f526-7d35-4b1a-8cae-31717f50e3c9 --bucket-ij_map 6 --machine-ij_map ab287001aa04ef81ea3d019ee56fd8b5b568309d9c43b447524b13c30c54159b --id-revision-ij_map 0 --files-ij_map C:\Users\Dane Miller\AppData\Local\JetBrains\Rider2024.2\event-log-data\logs\IJ_MAP\f363-4396-b4c1-9e9216fd19a4-242.19890.25-eap.log --escape-ij_map true --device-ml 0807241d847a558-847c-4916-99cb-48bb29043801 --bucket-ml 90 --machine-ml 586de2d1103e6bcd69c9413ab24a205f4e30f94672c974755414b8c98883ab22 --id-revision-ml 0 --files-ml C:\Users\Dane Miller\AppData\Local\JetBrains\Rider2024.2\event-log-data\logs\ML\a8c5-4f43-97b2-84818e459b44-242.19890.25-eap.log --escape-ml true --url https://resources.jetbrains.com/storage/fus/config/v4/%s/%s.json --product RD --product-version 2024.2 --baseline-version 242 --user-agent JetBrains Rider/242.19890.25 --extra-headers --eap
|
||||
|
||||
Host: 13th Gen Intel(R) Core(TM) i9-13900K, 32 cores, 63G, Windows 11 , 64 bit Build 22621 (10.0.22621.3672)
|
||||
Time: Wed Jul 10 08:19:51 2024 Central Daylight Time elapsed time: 2.855898 seconds (0d 0h 0m 2s)
|
||||
|
||||
--------------- T H R E A D ---------------
|
||||
|
||||
Current thread (0x00000247277c3cf0): JavaThread "C2 CompilerThread4" daemon [_thread_in_native, id=32152, stack(0x0000004d86300000,0x0000004d86400000) (1024K)]
|
||||
|
||||
|
||||
Current CompileTask:
|
||||
C2: 2855 3931 4 com.fasterxml.jackson.databind.deser.std.BaseNodeDeserializer::_deserializeContainerNoRecursion (616 bytes)
|
||||
|
||||
Stack: [0x0000004d86300000,0x0000004d86400000], sp=0x0000004d863fce40, free space=1011k
|
||||
Native frames: (J=compiled Java code, j=interpreted, Vv=VM code, C=native code)
|
||||
V [jvm.dll+0x733582]
|
||||
V [jvm.dll+0x6ba2eb]
|
||||
V [jvm.dll+0x39ddc3]
|
||||
V [jvm.dll+0x39b7fe]
|
||||
V [jvm.dll+0x1d0f44]
|
||||
V [jvm.dll+0x1d0f7c]
|
||||
V [jvm.dll+0x2fc274]
|
||||
V [jvm.dll+0x6fa6d6]
|
||||
V [jvm.dll+0x6f291b]
|
||||
V [jvm.dll+0x6f1f52]
|
||||
V [jvm.dll+0x6f011c]
|
||||
V [jvm.dll+0x1d048c]
|
||||
V [jvm.dll+0x24e52d]
|
||||
V [jvm.dll+0x1cd024]
|
||||
V [jvm.dll+0x25e12c]
|
||||
V [jvm.dll+0x25c606]
|
||||
V [jvm.dll+0x3fb046]
|
||||
V [jvm.dll+0x865328]
|
||||
V [jvm.dll+0x6deb2d]
|
||||
C [ucrtbase.dll+0x29333]
|
||||
C [KERNEL32.DLL+0x1257d]
|
||||
C [ntdll.dll+0x5af28]
|
||||
|
||||
|
||||
siginfo: EXCEPTION_ACCESS_VIOLATION (0xc0000005), reading address 0x00007ffc271a2000
|
||||
|
||||
|
||||
Registers:
|
||||
RAX=0x00000000000d474e, RBX=0x0000024727700208, RCX=0x0000024729caf050, RDX=0x0000000000800000
|
||||
RSP=0x0000004d863fce40, RBP=0x00000000000d474d, RSI=0x000002472a4c6050, RDI=0x0000000000000000
|
||||
R8 =0x00000000001a8e9a, R9 =0x0000000001038298, R10=0x0000000000000000, R11=0x0000000000000246
|
||||
R12=0x00000000000d474e, R13=0x00007ffc2645ab30, R14=0x0000000000d474d0, R15=0x00007ffc26de9d08
|
||||
RIP=0x00007ffc26b23582, EFLAGS=0x0000000000010206
|
||||
|
||||
|
||||
Register to memory mapping:
|
||||
|
||||
RAX=0x00000000000d474e is an unknown value
|
||||
RBX=0x0000024727700208 points into unknown readable memory: 0x00100000000d474e | 4e 47 0d 00 00 00 10 00
|
||||
RCX=0x0000024729caf050 points into unknown readable memory: 0xccccc300000058b8 | b8 58 00 00 00 c3 cc cc
|
||||
RDX=0x0000000000800000 is an unknown value
|
||||
RSP=0x0000004d863fce40 is pointing into the stack for thread: 0x00000247277c3cf0
|
||||
RBP=0x00000000000d474d is an unknown value
|
||||
RSI=0x000002472a4c6050 points into unknown readable memory: 0xccccc300000058b8 | b8 58 00 00 00 c3 cc cc
|
||||
RDI=0x0 is null
|
||||
R8 =0x00000000001a8e9a is an unknown value
|
||||
R9 =0x0000000001038298 is an unknown value
|
||||
R10=0x0 is null
|
||||
R11=0x0000000000000246 is an unknown value
|
||||
R12=0x00000000000d474e is an unknown value
|
||||
R13=0x00007ffc2645ab30 jvm.dll
|
||||
R14=0x0000000000d474d0 is an unknown value
|
||||
R15=0x00007ffc26de9d08 jvm.dll
|
||||
|
||||
Top of Stack: (sp=0x0000004d863fce40)
|
||||
0x0000004d863fce40: 0000024727700208 0000024727700208
|
||||
0x0000004d863fce50: 0000000000080000 00000247280329e8
|
||||
0x0000004d863fce60: 0000000000000000 0000000000000000
|
||||
0x0000004d863fce70: 0000004d863fd7a0 00000247210ee4a8
|
||||
0x0000004d863fce80: 0000004d863fe260 0000024727ae3d20
|
||||
0x0000004d863fce90: 0000024728034d78 00007ffc26aaa2eb
|
||||
0x0000004d863fcea0: 0000024728035978 0000024728035930
|
||||
0x0000004d863fceb0: 0000000000003db9 0000004d863fcf90
|
||||
0x0000004d863fcec0: 000000000000005a 00007ffc26a6dff3
|
||||
0x0000004d863fced0: 0000004d863fd7a0 00000247210ee4a8
|
||||
0x0000004d863fcee0: 0000000000000000 0000000000000000
|
||||
0x0000004d863fcef0: 000002472780caf0 00007ffc2678ddc3
|
||||
0x0000004d863fcf00: 0000024727ae3cd0 0000000000003db9
|
||||
0x0000004d863fcf10: 0000024728034d78 0000004d863fcf90
|
||||
0x0000004d863fcf20: 0000004d863fd000 00007ffc2678b7fe
|
||||
0x0000004d863fcf30: 0000004d863fcf90 0000004d863fcff9
|
||||
0x0000004d863fcf40: 0000000000000000 000002472776ab38
|
||||
0x0000004d863fcf50: 0000024728034cd0 00007ffc265c0f44
|
||||
0x0000004d863fcf60: 0000024728033f28 0000004d863fcff9
|
||||
0x0000004d863fcf70: 0000000000000000 0000000000000001
|
||||
0x0000004d863fcf80: 0000004d863fd070 0000024727ae3d00
|
||||
0x0000004d863fcf90: 00007ffc26e355c8 00007ffc00000001
|
||||
0x0000004d863fcfa0: 0000004d863fe260 0000004d863ff020
|
||||
0x0000004d863fcfb0: 0000004d863fd7a0 00000247280347f0
|
||||
0x0000004d863fcfc0: 0000000000000000 00007ffc00000159
|
||||
0x0000004d863fcfd0: 00000247267847e0 0000024772bc8e60
|
||||
0x0000004d863fcfe0: 0000000000000000 0000000000000000
|
||||
0x0000004d863fcff0: 00000247276ffff0 0000024721ab50f8
|
||||
0x0000004d863fd000: 0000004d863fcf90 00000247280347f0
|
||||
0x0000004d863fd010: 0000024700000000 0000004d863fd090
|
||||
0x0000004d863fd020: 0000000000000000 0000004d863fd7a0
|
||||
0x0000004d863fd030: 000002472776ab68 0000000000000000
|
||||
|
||||
Instructions: (pc=0x00007ffc26b23582)
|
||||
0x00007ffc26b23482: 01 85 c0 7e 04 85 c5 74 0c 0f bd c8 b8 01 00 00
|
||||
0x00007ffc26b23492: 00 ff c1 d3 e0 4c 8b 43 10 ba 10 00 00 00 89 43
|
||||
0x00007ffc26b234a2: 04 8b c8 4d 85 c0 75 07 e8 71 53 c7 ff eb 15 41
|
||||
0x00007ffc26b234b2: f6 c0 01 74 0a 49 d1 e8 e8 41 53 c7 ff eb 05 e8
|
||||
0x00007ffc26b234c2: fa 52 c7 ff 83 3b 00 48 8b f0 8b cf 4c 8b c7 7e
|
||||
0x00007ffc26b234d2: 28 48 8b d7 66 66 0f 1f 84 00 00 00 00 00 48 8b
|
||||
0x00007ffc26b234e2: 43 08 48 8d 52 10 ff c1 49 ff c0 0f 10 44 02 f0
|
||||
0x00007ffc26b234f2: 0f 11 44 32 f0 3b 0b 7c e5 3b 4b 04 7d 22 4d 03
|
||||
0x00007ffc26b23502: c0 4a 8d 04 c6 66 0f 1f 84 00 00 00 00 00 48 89
|
||||
0x00007ffc26b23512: 38 ff c1 48 89 78 08 48 8d 40 10 3b 4b 04 7c ee
|
||||
0x00007ffc26b23522: 48 8b 4b 08 48 85 c9 74 0b f6 43 10 01 74 05 e8
|
||||
0x00007ffc26b23532: 0a 53 c7 ff 48 89 73 08 eb 04 48 8b 73 08 48 63
|
||||
0x00007ffc26b23542: 03 4c 8b c5 48 3b c5 7d 2c 48 8b c8 48 8b d5 48
|
||||
0x00007ffc26b23552: c1 e1 04 48 2b d0 0f 1f 84 00 00 00 00 00 48 8b
|
||||
0x00007ffc26b23562: 43 08 48 8d 49 10 0f 11 74 01 f0 48 83 ea 01 75
|
||||
0x00007ffc26b23572: ed 48 8b 73 08 4d 03 c0 8d 45 01 89 03 41 ff c4
|
||||
0x00007ffc26b23582: 43 0f 10 44 35 00 49 83 c6 10 42 0f 11 04 c6 45
|
||||
0x00007ffc26b23592: 3b 27 0f 8c d6 fe ff ff 48 8b 74 24 60 0f 28 74
|
||||
0x00007ffc26b235a2: 24 20 4c 8b 74 24 38 4c 8b 6c 24 40 48 8b 6c 24
|
||||
0x00007ffc26b235b2: 70 4c 8b 7c 24 30 4c 8b 64 24 48 48 8b 7c 24 78
|
||||
0x00007ffc26b235c2: 48 89 1e 48 8b 5c 24 68 48 83 c4 50 5e c3 48 8b
|
||||
0x00007ffc26b235d2: 01 48 85 c0 74 08 83 38 00 74 03 32 c0 c3 b0 01
|
||||
0x00007ffc26b235e2: c3 cc cc cc cc cc cc cc cc cc cc cc cc cc 41 54
|
||||
0x00007ffc26b235f2: 41 55 48 83 ec 18 48 8b 01 4c 8b ea 4c 8b e1 48
|
||||
0x00007ffc26b23602: 85 c0 0f 84 d4 00 00 00 4c 89 74 24 08 4c 63 30
|
||||
0x00007ffc26b23612: 45 85 f6 0f 84 be 00 00 00 4c 8b 02 4d 85 c0 0f
|
||||
0x00007ffc26b23622: 84 df 00 00 00 41 83 38 00 0f 84 d5 00 00 00 48
|
||||
0x00007ffc26b23632: 89 7c 24 10 33 ff 4c 89 3c 24 45 85 f6 0f 8e 8b
|
||||
0x00007ffc26b23642: 00 00 00 48 89 5c 24 30 45 33 c9 48 89 6c 24 38
|
||||
0x00007ffc26b23652: 45 33 d2 48 89 74 24 40 33 f6 0f 1f 40 00 49 8b
|
||||
0x00007ffc26b23662: 04 24 45 33 c0 33 d2 48 8b 68 08 49 8b 45 00 48
|
||||
0x00007ffc26b23672: 63 08 85 c9 7e 2a 4c 8b 1c 2e 48 8b d9 48 8b 40
|
||||
|
||||
|
||||
Stack slot to memory mapping:
|
||||
|
||||
stack at sp + 0 slots: 0x0000024727700208 points into unknown readable memory: 0x00100000000d474e | 4e 47 0d 00 00 00 10 00
|
||||
stack at sp + 1 slots: 0x0000024727700208 points into unknown readable memory: 0x00100000000d474e | 4e 47 0d 00 00 00 10 00
|
||||
stack at sp + 2 slots: 524288 is a compressed pointer to class: 0x0000000800080000
|
||||
jdk.internal.org.objectweb.asm.ByteVector {0x0000000800080008}
|
||||
- instance size: 3
|
||||
- klass size: 76
|
||||
- access: public synchronized
|
||||
- flags: rewritten has_nonstatic_fields has_localvariable_table has_final_method
|
||||
- state: fully_initialized
|
||||
- name: 'jdk/internal/org/objectweb/asm/ByteVector'
|
||||
- super: 'java/lang/Object'
|
||||
- sub:
|
||||
- arrays: null
|
||||
- methods: Array<T>(0x00000247225cadb0)
|
||||
- method ordering: Array<T>(0x0000024722000018)
|
||||
- default_methods: Array<T>(0x0000000000000000)
|
||||
- local interfaces: Array<T>(0x0000024722000058)
|
||||
- trans. interfaces: Array<T>(0x0000024722000058)
|
||||
- constants: constant pool [109] {0x00000247225ca9c8} for 'jdk/internal/org/objectweb/asm/ByteVector' cache=0x00000247225cc358
|
||||
- class loader data: loader data: 0x000002477e431f00 of 'bootstrap'
|
||||
- source file: 'ByteVector.java'
|
||||
- class annotations: Array<T>(0x0000000000000000)
|
||||
- class type annotations: Array<T>(0x0000000000000000)
|
||||
- field annotations: Array<T>(0x0000000000000000)
|
||||
- field type annotations: Array<T>(0x0000000000000000)
|
||||
- inner classes: Array<T>(0x0000024722000028)
|
||||
- nest members: Array<T>(0x0000024722000028)
|
||||
- permitted subclasses: Array<T>(0x0000024722000028)
|
||||
- java mirror: a 'java/lang/Class'{0x000000040413be50} = 'jdk/internal/org/objectweb/asm/ByteVector'
|
||||
- vtable length 12 (start addr: 0x00000008000801e8)
|
||||
- itable length 2 (start addr: 0x0000000800080248)
|
||||
- ---- static fields (0 words):
|
||||
- ---- non-static fields (2 words):
|
||||
- 'length' 'I' @12
|
||||
- 'data' '[B' @16
|
||||
- non-static oop maps: 16-16
|
||||
stack at sp + 3 slots: 0x00000247280329e8 points into unknown readable memory: 0x00007ffc26de9470 | 70 94 de 26 fc 7f 00 00
|
||||
stack at sp + 4 slots: 0x0 is null
|
||||
stack at sp + 5 slots: 0x0 is null
|
||||
stack at sp + 6 slots: 0x0000004d863fd7a0 is pointing into the stack for thread: 0x00000247277c3cf0
|
||||
stack at sp + 7 slots: 0x00000247210ee4a8 points into unknown readable memory: 0x00007ffc26d613e8 | e8 13 d6 26 fc 7f 00 00
|
||||
|
||||
|
||||
--------------- P R O C E S S ---------------
|
||||
|
||||
Threads class SMR info:
|
||||
_java_thread_list=0x0000024727894c10, length=53, elements={
|
||||
0x0000024772bdaa30, 0x0000024721093f50, 0x0000024721098c30, 0x000002472109fc00,
|
||||
0x00000247210a0660, 0x000002472109d0c0, 0x000002472109ed80, 0x000002472107e9e0,
|
||||
0x000002472107f5b0, 0x00000247211438b0, 0x00000247212a5c70, 0x00000247212a6ec0,
|
||||
0x000002472155b4c0, 0x000002472155bb70, 0x000002472155c630, 0x00000247219f5670,
|
||||
0x0000024721b1ddb0, 0x00000247216e8530, 0x0000024721840910, 0x0000024721be3c00,
|
||||
0x0000024721be4270, 0x0000024721bdf780, 0x0000024721bdf0f0, 0x0000024721bdea60,
|
||||
0x00000247262c25a0, 0x00000247262c4d00, 0x00000247262c5390, 0x00000247262c32c0,
|
||||
0x00000247262c3fe0, 0x00000247262c5a20, 0x00000247262c2c30, 0x00000247262c4670,
|
||||
0x00000247262c3950, 0x00000247262d71b0, 0x00000247266dd720, 0x00000247266e3630,
|
||||
0x00000247266e8540, 0x00000247277c3cf0, 0x00000247278e9210, 0x0000024727dc1780,
|
||||
0x000002472792ed50, 0x00000247262d9280, 0x00000247262d9910, 0x00000247262dcd90,
|
||||
0x00000247262da630, 0x00000247262dc700, 0x00000247262d6b20, 0x00000247262dd420,
|
||||
0x00000247262d7840, 0x00000247262dc070, 0x00000247262ddab0, 0x00000247262dacc0,
|
||||
0x00000247262d7ed0
|
||||
}
|
||||
|
||||
Java Threads: ( => current thread )
|
||||
0x0000024772bdaa30 JavaThread "main" [_thread_blocked, id=32104, stack(0x0000004d81400000,0x0000004d81500000) (1024K)]
|
||||
0x0000024721093f50 JavaThread "Reference Handler" daemon [_thread_blocked, id=20332, stack(0x0000004d81c00000,0x0000004d81d00000) (1024K)]
|
||||
0x0000024721098c30 JavaThread "Finalizer" daemon [_thread_blocked, id=8344, stack(0x0000004d81d00000,0x0000004d81e00000) (1024K)]
|
||||
0x000002472109fc00 JavaThread "Signal Dispatcher" daemon [_thread_blocked, id=30476, stack(0x0000004d81e00000,0x0000004d81f00000) (1024K)]
|
||||
0x00000247210a0660 JavaThread "Attach Listener" daemon [_thread_blocked, id=34820, stack(0x0000004d81f00000,0x0000004d82000000) (1024K)]
|
||||
0x000002472109d0c0 JavaThread "Service Thread" daemon [_thread_blocked, id=28360, stack(0x0000004d82000000,0x0000004d82100000) (1024K)]
|
||||
0x000002472109ed80 JavaThread "Monitor Deflation Thread" daemon [_thread_blocked, id=1528, stack(0x0000004d82100000,0x0000004d82200000) (1024K)]
|
||||
0x000002472107e9e0 JavaThread "C2 CompilerThread0" daemon [_thread_in_native, id=30748, stack(0x0000004d82200000,0x0000004d82300000) (1024K)]
|
||||
0x000002472107f5b0 JavaThread "C1 CompilerThread0" daemon [_thread_blocked, id=35880, stack(0x0000004d82300000,0x0000004d82400000) (1024K)]
|
||||
0x00000247211438b0 JavaThread "C1 CompilerThread1" daemon [_thread_blocked, id=7040, stack(0x0000004d82400000,0x0000004d82500000) (1024K)]
|
||||
0x00000247212a5c70 JavaThread "Notification Thread" daemon [_thread_blocked, id=19464, stack(0x0000004d82500000,0x0000004d82600000) (1024K)]
|
||||
0x00000247212a6ec0 JavaThread "Common-Cleaner" daemon [_thread_blocked, id=35060, stack(0x0000004d82600000,0x0000004d82700000) (1024K)]
|
||||
0x000002472155b4c0 JavaThread "C1 CompilerThread2" daemon [_thread_blocked, id=28376, stack(0x0000004d82900000,0x0000004d82a00000) (1024K)]
|
||||
0x000002472155bb70 JavaThread "C1 CompilerThread3" daemon [_thread_blocked, id=13916, stack(0x0000004d82a00000,0x0000004d82b00000) (1024K)]
|
||||
0x000002472155c630 JavaThread "C1 CompilerThread4" daemon [_thread_blocked, id=33836, stack(0x0000004d82b00000,0x0000004d82c00000) (1024K)]
|
||||
0x00000247219f5670 JavaThread "pool-1-thread-1" [_thread_blocked, id=9628, stack(0x0000004d82c00000,0x0000004d82d00000) (1024K)]
|
||||
0x0000024721b1ddb0 JavaThread "pool-1-thread-2" [_thread_in_Java, id=30852, stack(0x0000004d82d00000,0x0000004d82e00000) (1024K)]
|
||||
0x00000247216e8530 JavaThread "pool-1-thread-4" [_thread_blocked, id=38696, stack(0x0000004d82f00000,0x0000004d83000000) (1024K)]
|
||||
0x0000024721840910 JavaThread "pool-1-thread-5" [_thread_blocked, id=37440, stack(0x0000004d83000000,0x0000004d83100000) (1024K)]
|
||||
0x0000024721be3c00 JavaThread "HttpClient-2-SelectorManager" daemon [_thread_in_native, id=26244, stack(0x0000004d83100000,0x0000004d83200000) (1024K)]
|
||||
0x0000024721be4270 JavaThread "HttpClient-4-SelectorManager" daemon [_thread_in_native, id=1964, stack(0x0000004d83200000,0x0000004d83300000) (1024K)]
|
||||
0x0000024721bdf780 JavaThread "HttpClient-1-SelectorManager" daemon [_thread_in_native, id=16544, stack(0x0000004d83300000,0x0000004d83400000) (1024K)]
|
||||
0x0000024721bdf0f0 JavaThread "HttpClient-3-SelectorManager" daemon [_thread_in_native, id=4736, stack(0x0000004d83400000,0x0000004d83500000) (1024K)]
|
||||
0x0000024721bdea60 JavaThread "HttpClient-5-SelectorManager" daemon [_thread_in_native, id=2456, stack(0x0000004d83500000,0x0000004d83600000) (1024K)]
|
||||
0x00000247262c25a0 JavaThread "HttpClient-3-Worker-0" daemon [_thread_blocked, id=34988, stack(0x0000004d83800000,0x0000004d83900000) (1024K)]
|
||||
0x00000247262c4d00 JavaThread "HttpClient-2-Worker-0" daemon [_thread_blocked, id=37568, stack(0x0000004d83900000,0x0000004d83a00000) (1024K)]
|
||||
0x00000247262c5390 JavaThread "HttpClient-4-Worker-0" daemon [_thread_blocked, id=33296, stack(0x0000004d83a00000,0x0000004d83b00000) (1024K)]
|
||||
0x00000247262c32c0 JavaThread "HttpClient-5-Worker-0" daemon [_thread_blocked, id=33900, stack(0x0000004d83b00000,0x0000004d83c00000) (1024K)]
|
||||
0x00000247262c3fe0 JavaThread "HttpClient-1-Worker-0" daemon [_thread_blocked, id=34660, stack(0x0000004d83c00000,0x0000004d83d00000) (1024K)]
|
||||
0x00000247262c5a20 JavaThread "HttpClient-2-Worker-1" daemon [_thread_blocked, id=1060, stack(0x0000004d83d00000,0x0000004d83e00000) (1024K)]
|
||||
0x00000247262c2c30 JavaThread "HttpClient-3-Worker-1" daemon [_thread_blocked, id=32644, stack(0x0000004d83e00000,0x0000004d83f00000) (1024K)]
|
||||
0x00000247262c4670 JavaThread "HttpClient-4-Worker-1" daemon [_thread_blocked, id=31368, stack(0x0000004d83f00000,0x0000004d84000000) (1024K)]
|
||||
0x00000247262c3950 JavaThread "HttpClient-5-Worker-1" daemon [_thread_blocked, id=35704, stack(0x0000004d84000000,0x0000004d84100000) (1024K)]
|
||||
0x00000247262d71b0 JavaThread "HttpClient-1-Worker-1" daemon [_thread_blocked, id=21364, stack(0x0000004d84100000,0x0000004d84200000) (1024K)]
|
||||
0x00000247266dd720 JavaThread "C2 CompilerThread1" daemon [_thread_in_vm, id=33288, stack(0x0000004d82700000,0x0000004d82800000) (1024K)]
|
||||
0x00000247266e3630 JavaThread "C2 CompilerThread2" daemon [_thread_in_native, id=33892, stack(0x0000004d82800000,0x0000004d82900000) (1024K)]
|
||||
0x00000247266e8540 JavaThread "C2 CompilerThread3" daemon [_thread_in_native, id=34700, stack(0x0000004d86200000,0x0000004d86300000) (1024K)]
|
||||
=>0x00000247277c3cf0 JavaThread "C2 CompilerThread4" daemon [_thread_in_native, id=32152, stack(0x0000004d86300000,0x0000004d86400000) (1024K)]
|
||||
0x00000247278e9210 JavaThread "C2 CompilerThread5" daemon [_thread_in_native, id=31652, stack(0x0000004d86400000,0x0000004d86500000) (1024K)]
|
||||
0x0000024727dc1780 JavaThread "C2 CompilerThread6" daemon [_thread_in_native, id=35752, stack(0x0000004d86500000,0x0000004d86600000) (1024K)]
|
||||
0x000002472792ed50 JavaThread "C2 CompilerThread7" daemon [_thread_in_native, id=30704, stack(0x0000004d86600000,0x0000004d86700000) (1024K)]
|
||||
0x00000247262d9280 JavaThread "HttpClient-12-SelectorManager" daemon [_thread_in_native, id=1360, stack(0x0000004d86900000,0x0000004d86a00000) (1024K)]
|
||||
0x00000247262d9910 JavaThread "HttpClient-13-SelectorManager" daemon [_thread_in_native, id=31832, stack(0x0000004d86a00000,0x0000004d86b00000) (1024K)]
|
||||
0x00000247262dcd90 JavaThread "HttpClient-11-SelectorManager" daemon [_thread_in_native, id=37240, stack(0x0000004d86b00000,0x0000004d86c00000) (1024K)]
|
||||
0x00000247262da630 JavaThread "HttpClient-14-SelectorManager" daemon [_thread_in_native, id=34828, stack(0x0000004d82e00000,0x0000004d82f00000) (1024K)]
|
||||
0x00000247262dc700 JavaThread "HttpClient-13-Worker-0" daemon [_thread_blocked, id=37320, stack(0x0000004d83600000,0x0000004d83700000) (1024K)]
|
||||
0x00000247262d6b20 JavaThread "HttpClient-13-Worker-1" daemon [_thread_blocked, id=29512, stack(0x0000004d85d00000,0x0000004d85e00000) (1024K)]
|
||||
0x00000247262dd420 JavaThread "HttpClient-11-Worker-0" daemon [_thread_blocked, id=34340, stack(0x0000004d85e00000,0x0000004d85f00000) (1024K)]
|
||||
0x00000247262d7840 JavaThread "HttpClient-12-Worker-0" daemon [_thread_blocked, id=31048, stack(0x0000004d85f00000,0x0000004d86000000) (1024K)]
|
||||
0x00000247262dc070 JavaThread "HttpClient-12-Worker-1" daemon [_thread_blocked, id=13300, stack(0x0000004d86000000,0x0000004d86100000) (1024K)]
|
||||
0x00000247262ddab0 JavaThread "HttpClient-11-Worker-1" daemon [_thread_blocked, id=38668, stack(0x0000004d86100000,0x0000004d86200000) (1024K)]
|
||||
0x00000247262dacc0 JavaThread "HttpClient-15-SelectorManager" daemon [_thread_in_native, id=33020, stack(0x0000004d86700000,0x0000004d86800000) (1024K)]
|
||||
0x00000247262d7ed0 JavaThread "HttpClient-16-SelectorManager" daemon [_thread_in_native, id=18392, stack(0x0000004d86800000,0x0000004d86900000) (1024K)]
|
||||
Total: 53
|
||||
|
||||
Other Threads:
|
||||
0x000002472101eaa0 VMThread "VM Thread" [id=34292, stack(0x0000004d81b00000,0x0000004d81c00000) (1024K)]
|
||||
0x000002477e492ed0 WatcherThread "VM Periodic Task Thread" [id=31844, stack(0x0000004d81a00000,0x0000004d81b00000) (1024K)]
|
||||
0x000002477e32fc90 WorkerThread "GC Thread#0" [id=32488, stack(0x0000004d81500000,0x0000004d81600000) (1024K)]
|
||||
0x0000024726639e20 WorkerThread "GC Thread#1" [id=22644, stack(0x0000004d84200000,0x0000004d84300000) (1024K)]
|
||||
0x00000247262c8190 WorkerThread "GC Thread#2" [id=19260, stack(0x0000004d84300000,0x0000004d84400000) (1024K)]
|
||||
0x00000247262c8d50 WorkerThread "GC Thread#3" [id=38388, stack(0x0000004d84400000,0x0000004d84500000) (1024K)]
|
||||
0x00000247262c90f0 WorkerThread "GC Thread#4" [id=28512, stack(0x0000004d84500000,0x0000004d84600000) (1024K)]
|
||||
0x00000247262c9490 WorkerThread "GC Thread#5" [id=3236, stack(0x0000004d84600000,0x0000004d84700000) (1024K)]
|
||||
0x00000247262cd060 WorkerThread "GC Thread#6" [id=37100, stack(0x0000004d84700000,0x0000004d84800000) (1024K)]
|
||||
0x000002472675caf0 WorkerThread "GC Thread#7" [id=27480, stack(0x0000004d84800000,0x0000004d84900000) (1024K)]
|
||||
0x000002472675ce90 WorkerThread "GC Thread#8" [id=37332, stack(0x0000004d84900000,0x0000004d84a00000) (1024K)]
|
||||
0x000002472675d230 WorkerThread "GC Thread#9" [id=35308, stack(0x0000004d84a00000,0x0000004d84b00000) (1024K)]
|
||||
0x000002472675fa10 WorkerThread "GC Thread#10" [id=27684, stack(0x0000004d84b00000,0x0000004d84c00000) (1024K)]
|
||||
0x0000024726762030 WorkerThread "GC Thread#11" [id=20496, stack(0x0000004d84c00000,0x0000004d84d00000) (1024K)]
|
||||
0x00000247267618f0 WorkerThread "GC Thread#12" [id=36096, stack(0x0000004d84d00000,0x0000004d84e00000) (1024K)]
|
||||
0x00000247267623d0 WorkerThread "GC Thread#13" [id=4676, stack(0x0000004d84e00000,0x0000004d84f00000) (1024K)]
|
||||
0x0000024726761c90 WorkerThread "GC Thread#14" [id=29088, stack(0x0000004d84f00000,0x0000004d85000000) (1024K)]
|
||||
0x0000024726762770 WorkerThread "GC Thread#15" [id=27464, stack(0x0000004d85000000,0x0000004d85100000) (1024K)]
|
||||
0x0000024726760e10 WorkerThread "GC Thread#16" [id=10360, stack(0x0000004d85100000,0x0000004d85200000) (1024K)]
|
||||
0x0000024726761550 WorkerThread "GC Thread#17" [id=38396, stack(0x0000004d85200000,0x0000004d85300000) (1024K)]
|
||||
0x00000247267611b0 WorkerThread "GC Thread#18" [id=34852, stack(0x0000004d85300000,0x0000004d85400000) (1024K)]
|
||||
0x0000024726597f40 WorkerThread "GC Thread#19" [id=31360, stack(0x0000004d85400000,0x0000004d85500000) (1024K)]
|
||||
0x0000024726595ea0 WorkerThread "GC Thread#20" [id=23492, stack(0x0000004d85500000,0x0000004d85600000) (1024K)]
|
||||
0x0000024726595760 WorkerThread "GC Thread#21" [id=12280, stack(0x0000004d85600000,0x0000004d85700000) (1024K)]
|
||||
0x0000024726596980 WorkerThread "GC Thread#22" [id=24744, stack(0x0000004d85700000,0x0000004d85800000) (1024K)]
|
||||
0x000002477505deb0 ConcurrentGCThread "G1 Main Marker" [id=30808, stack(0x0000004d81600000,0x0000004d81700000) (1024K)]
|
||||
0x000002477e330ef0 WorkerThread "G1 Conc#0" [id=23576, stack(0x0000004d81700000,0x0000004d81800000) (1024K)]
|
||||
0x0000024726596d20 WorkerThread "G1 Conc#1" [id=19308, stack(0x0000004d85800000,0x0000004d85900000) (1024K)]
|
||||
0x0000024726597460 WorkerThread "G1 Conc#2" [id=33084, stack(0x0000004d85900000,0x0000004d85a00000) (1024K)]
|
||||
0x00000247265965e0 WorkerThread "G1 Conc#3" [id=23824, stack(0x0000004d85a00000,0x0000004d85b00000) (1024K)]
|
||||
0x00000247265982e0 WorkerThread "G1 Conc#4" [id=31996, stack(0x0000004d85b00000,0x0000004d85c00000) (1024K)]
|
||||
0x0000024726598680 WorkerThread "G1 Conc#5" [id=4752, stack(0x0000004d85c00000,0x0000004d85d00000) (1024K)]
|
||||
0x000002477e445070 ConcurrentGCThread "G1 Refine#0" [id=35800, stack(0x0000004d81800000,0x0000004d81900000) (1024K)]
|
||||
0x000002477e445be0 ConcurrentGCThread "G1 Service" [id=28944, stack(0x0000004d81900000,0x0000004d81a00000) (1024K)]
|
||||
Total: 34
|
||||
|
||||
Threads with active compile tasks:
|
||||
C2 CompilerThread0 2883 4247 4 com.fasterxml.jackson.databind.util.LRUMap::<init> (42 bytes)
|
||||
C2 CompilerThread1 2883 4250 4 com.fasterxml.jackson.databind.node.InternalNodeMapper$IteratorStack::push (118 bytes)
|
||||
C2 CompilerThread2 2883 4233 4 com.fasterxml.jackson.core.json.ReaderBasedJsonParser::nextToken (535 bytes)
|
||||
C2 CompilerThread3 2883 4015 4 com.fasterxml.jackson.databind.ser.std.MapSerializer::_findSerializer (63 bytes)
|
||||
C2 CompilerThread4 2883 3931 4 com.fasterxml.jackson.databind.deser.std.BaseNodeDeserializer::_deserializeContainerNoRecursion (616 bytes)
|
||||
C2 CompilerThread5 2883 4185 ! 4 com.fasterxml.jackson.databind.SerializerProvider::_createAndCacheUntypedSerializer (50 bytes)
|
||||
C2 CompilerThread6 2883 4245 4 com.fasterxml.jackson.databind.introspect.BasicClassIntrospector::forClassAnnotations (30 bytes)
|
||||
C2 CompilerThread7 2883 4096 4 com.fasterxml.jackson.databind.introspect.BasicClassIntrospector::forSerialization (42 bytes)
|
||||
Total: 8
|
||||
|
||||
VM state: not at safepoint (normal execution)
|
||||
|
||||
VM Mutex/Monitor currently owned by a thread: None
|
||||
|
||||
Heap address: 0x0000000404000000, size: 16320 MB, Compressed Oops mode: Zero based, Oop shift amount: 3
|
||||
|
||||
CDS archive(s) not mapped
|
||||
Compressed class space mapped at: 0x0000000800000000-0x0000000840000000, reserved size: 1073741824
|
||||
Narrow klass base: 0x0000000800000000, Narrow klass shift: 0, Narrow klass range: 0x40000000
|
||||
|
||||
GC Precious Log:
|
||||
CardTable entry size: 512
|
||||
Card Set container configuration: InlinePtr #cards 4 size 8 Array Of Cards #cards 64 size 144 Howl #buckets 8 coarsen threshold 14745 Howl Bitmap #cards 2048 size 272 coarsen threshold 1843 Card regions per heap region 1 cards per card region 16384
|
||||
CPUs: 32 total, 32 available
|
||||
Memory: 65273M
|
||||
Large Page Support: Disabled
|
||||
NUMA Support: Disabled
|
||||
Compressed Oops: Enabled (Zero based)
|
||||
Heap Region Size: 8M
|
||||
Heap Min Capacity: 8M
|
||||
Heap Initial Capacity: 1G
|
||||
Heap Max Capacity: 16320M
|
||||
Pre-touch: Disabled
|
||||
Parallel Workers: 23
|
||||
Concurrent Workers: 6
|
||||
Concurrent Refinement Workers: 23
|
||||
Periodic GC: Disabled
|
||||
|
||||
Heap:
|
||||
garbage-first heap total 114688K, used 31537K [0x0000000404000000, 0x0000000800000000)
|
||||
region size 8192K, 5 young (40960K), 1 survivors (8192K)
|
||||
Metaspace used 32084K, committed 32640K, reserved 1114112K
|
||||
class space used 3400K, committed 3648K, reserved 1048576K
|
||||
|
||||
Heap Regions: E=young(eden), S=young(survivor), O=old, HS=humongous(starts), HC=humongous(continues), CS=collection set, F=free, TAMS=top-at-mark-start, PB=parsable bottom
|
||||
| 0|0x0000000404000000, 0x0000000404800000, 0x0000000404800000|100%| O| |TAMS 0x0000000404000000| PB 0x0000000404000000| Untracked
|
||||
| 1|0x0000000404800000, 0x0000000404ad90a8, 0x0000000405000000| 35%| O|Cm|TAMS 0x0000000404800000| PB 0x0000000404800000| Complete
|
||||
| 2|0x0000000405000000, 0x0000000405000000, 0x0000000405800000| 0%| F| |TAMS 0x0000000405000000| PB 0x0000000405000000| Untracked
|
||||
| 3|0x0000000405800000, 0x0000000405800000, 0x0000000406000000| 0%| F| |TAMS 0x0000000405800000| PB 0x0000000405800000| Untracked
|
||||
| 4|0x0000000406000000, 0x00000004063f36e0, 0x0000000406800000| 49%| S|CS|TAMS 0x0000000406000000| PB 0x0000000406000000| Complete
|
||||
| 5|0x0000000406800000, 0x0000000406800000, 0x0000000407000000| 0%| F| |TAMS 0x0000000406800000| PB 0x0000000406800000| Untracked
|
||||
| 6|0x0000000407000000, 0x0000000407000000, 0x0000000407800000| 0%| F| |TAMS 0x0000000407000000| PB 0x0000000407000000| Untracked
|
||||
| 7|0x0000000407800000, 0x0000000407800000, 0x0000000408000000| 0%| F| |TAMS 0x0000000407800000| PB 0x0000000407800000| Untracked
|
||||
| 8|0x0000000408000000, 0x0000000408000000, 0x0000000408800000| 0%| F| |TAMS 0x0000000408000000| PB 0x0000000408000000| Untracked
|
||||
| 9|0x0000000408800000, 0x0000000408800000, 0x0000000409000000| 0%| F| |TAMS 0x0000000408800000| PB 0x0000000408800000| Untracked
|
||||
| 10|0x0000000409000000, 0x0000000409800000, 0x0000000409800000|100%| E| |TAMS 0x0000000409000000| PB 0x0000000409000000| Complete
|
||||
| 11|0x0000000409800000, 0x000000040a000000, 0x000000040a000000|100%| E|CS|TAMS 0x0000000409800000| PB 0x0000000409800000| Complete
|
||||
| 126|0x0000000443000000, 0x0000000443800000, 0x0000000443800000|100%| E| |TAMS 0x0000000443000000| PB 0x0000000443000000| Complete
|
||||
| 127|0x0000000443800000, 0x0000000444000000, 0x0000000444000000|100%| E|CS|TAMS 0x0000000443800000| PB 0x0000000443800000| Complete
|
||||
|
||||
Card table byte_map: [0x000002477c1c0000,0x000002477e1a0000] _byte_map_base: 0x000002477a1a0000
|
||||
|
||||
Marking Bits: (CMBitMap*) 0x000002477e3302a0
|
||||
Bits: [0x000002470f000000, 0x000002471ef00000)
|
||||
|
||||
Polling page: 0x0000024772ea0000
|
||||
|
||||
Metaspace:
|
||||
|
||||
Usage:
|
||||
Non-class: 28.01 MB used.
|
||||
Class: 3.32 MB used.
|
||||
Both: 31.33 MB used.
|
||||
|
||||
Virtual space:
|
||||
Non-class space: 64.00 MB reserved, 28.31 MB ( 44%) committed, 1 nodes.
|
||||
Class space: 1.00 GB reserved, 3.56 MB ( <1%) committed, 1 nodes.
|
||||
Both: 1.06 GB reserved, 31.88 MB ( 3%) committed.
|
||||
|
||||
Chunk freelists:
|
||||
Non-Class: 3.70 MB
|
||||
Class: 12.38 MB
|
||||
Both: 16.08 MB
|
||||
|
||||
MaxMetaspaceSize: unlimited
|
||||
CompressedClassSpaceSize: 1.00 GB
|
||||
Initial GC threshold: 21.00 MB
|
||||
Current GC threshold: 35.12 MB
|
||||
CDS: off
|
||||
- commit_granule_bytes: 65536.
|
||||
- commit_granule_words: 8192.
|
||||
- virtual_space_node_default_size: 8388608.
|
||||
- enlarge_chunks_in_place: 1.
|
||||
- use_allocation_guard: 0.
|
||||
|
||||
|
||||
Internal statistics:
|
||||
|
||||
num_allocs_failed_limit: 3.
|
||||
num_arena_births: 882.
|
||||
num_arena_deaths: 0.
|
||||
num_vsnodes_births: 2.
|
||||
num_vsnodes_deaths: 0.
|
||||
num_space_committed: 510.
|
||||
num_space_uncommitted: 0.
|
||||
num_chunks_returned_to_freelist: 3.
|
||||
num_chunks_taken_from_freelist: 1570.
|
||||
num_chunk_merges: 3.
|
||||
num_chunk_splits: 974.
|
||||
num_chunks_enlarged: 486.
|
||||
num_inconsistent_stats: 0.
|
||||
|
||||
CodeHeap 'non-profiled nmethods': size=118848Kb used=1778Kb max_used=1778Kb free=117069Kb
|
||||
bounds [0x0000024707bf0000, 0x0000024707e60000, 0x000002470f000000]
|
||||
CodeHeap 'profiled nmethods': size=118848Kb used=8725Kb max_used=8725Kb free=110122Kb
|
||||
bounds [0x0000024700000000, 0x0000024700890000, 0x0000024707410000]
|
||||
CodeHeap 'non-nmethods': size=8064Kb used=3824Kb max_used=3870Kb free=4239Kb
|
||||
bounds [0x0000024707410000, 0x00000247077e0000, 0x0000024707bf0000]
|
||||
total_blobs=4873 nmethods=4242 adapters=531
|
||||
compilation: enabled
|
||||
stopped_count=0, restarted_count=0
|
||||
full_count=0
|
||||
|
||||
Compilation events (20 events):
|
||||
Event: 2.845 Thread 0x000002472107f5b0 nmethod 4129 0x0000024707d8ea90 code [0x0000024707d8ec20, 0x0000024707d8ece8]
|
||||
Event: 2.848 Thread 0x0000024727dc1780 nmethod 4122 0x0000024707d8ed90 code [0x0000024707d8f020, 0x0000024707d8fd18]
|
||||
Event: 2.848 Thread 0x00000247266dd720 nmethod 4070 0x0000024707d90710 code [0x0000024707d90a40, 0x0000024707d927c8]
|
||||
Event: 2.848 Thread 0x000002472155b4c0 4130 1 java.util.zip.Deflater$DeflaterZStreamRef::address (5 bytes)
|
||||
Event: 2.848 Thread 0x0000024727dc1780 4125 4 java.util.LinkedHashMap$LinkedEntrySet::iterator (16 bytes)
|
||||
Event: 2.848 Thread 0x00000247266dd720 4127 4 com.fasterxml.jackson.databind.node.ObjectNode::fields (15 bytes)
|
||||
Event: 2.848 Thread 0x00000247211438b0 4131 3 java.lang.invoke.DirectMethodHandle$Holder::newInvokeSpecial (28 bytes)
|
||||
Event: 2.848 Thread 0x000002472155b4c0 nmethod 4130 0x0000024707d93490 code [0x0000024707d93620, 0x0000024707d936e8]
|
||||
Event: 2.848 Thread 0x000002472107e9e0 nmethod 4123 0x0000024707d93790 code [0x0000024707d93a00, 0x0000024707d94698]
|
||||
Event: 2.848 Thread 0x00000247278e9210 nmethod 4124 0x0000024707d95010 code [0x0000024707d95260, 0x0000024707d95bc0]
|
||||
Event: 2.848 Thread 0x000002472155bb70 4132 3 jdk.internal.net.http.HttpClientImpl::isSelectorThread (16 bytes)
|
||||
Event: 2.849 Thread 0x00000247211438b0 nmethod 4131 0x0000024700832310 code [0x0000024700832500, 0x0000024700832ca0]
|
||||
Event: 2.849 Thread 0x000002472155bb70 nmethod 4132 0x0000024700832e90 code [0x0000024700833040, 0x00000247008331c8]
|
||||
Event: 2.849 Thread 0x0000024727dc1780 nmethod 4125 0x0000024707d96310 code [0x0000024707d964a0, 0x0000024707d966d0]
|
||||
Event: 2.849 Thread 0x000002472107f5b0 4134 3 java.lang.StringConcatHelper::prepend (22 bytes)
|
||||
Event: 2.849 Thread 0x000002472155b4c0 4135 3 java.lang.invoke.DirectMethodHandle$Holder::invokeStatic (21 bytes)
|
||||
Event: 2.849 Thread 0x000002472155c630 4133 3 java.lang.invoke.LambdaForm$MH/0x00000008000c4c00::invoke (32 bytes)
|
||||
Event: 2.849 Thread 0x000002472107f5b0 nmethod 4134 0x0000024700833290 code [0x0000024700833440, 0x00000247008335d0]
|
||||
Event: 2.850 Thread 0x000002472155c630 nmethod 4133 0x0000024700833690 code [0x0000024700833860, 0x0000024700833d28]
|
||||
Event: 2.850 Thread 0x000002472155b4c0 nmethod 4135 0x0000024700833e90 code [0x0000024700834060, 0x0000024700834540]
|
||||
|
||||
GC Heap History (6 events):
|
||||
Event: 1.806 GC heap before
|
||||
{Heap before GC invocations=0 (full 0):
|
||||
garbage-first heap total 1048576K, used 40960K [0x0000000404000000, 0x0000000800000000)
|
||||
region size 8192K, 6 young (49152K), 0 survivors (0K)
|
||||
Metaspace used 20232K, committed 20736K, reserved 1114112K
|
||||
class space used 2092K, committed 2304K, reserved 1048576K
|
||||
}
|
||||
Event: 1.810 GC heap after
|
||||
{Heap after GC invocations=1 (full 0):
|
||||
garbage-first heap total 1048576K, used 9705K [0x0000000404000000, 0x0000000800000000)
|
||||
region size 8192K, 1 young (8192K), 1 survivors (8192K)
|
||||
Metaspace used 20232K, committed 20736K, reserved 1114112K
|
||||
class space used 2092K, committed 2304K, reserved 1048576K
|
||||
}
|
||||
Event: 1.824 GC heap before
|
||||
{Heap before GC invocations=1 (full 0):
|
||||
garbage-first heap total 1048576K, used 9705K [0x0000000404000000, 0x0000000800000000)
|
||||
region size 8192K, 2 young (16384K), 1 survivors (8192K)
|
||||
Metaspace used 21008K, committed 21504K, reserved 1114112K
|
||||
class space used 2213K, committed 2432K, reserved 1048576K
|
||||
}
|
||||
Event: 1.826 GC heap after
|
||||
{Heap after GC invocations=2 (full 0):
|
||||
garbage-first heap total 1048576K, used 11822K [0x0000000404000000, 0x0000000800000000)
|
||||
region size 8192K, 1 young (8192K), 1 survivors (8192K)
|
||||
Metaspace used 21008K, committed 21504K, reserved 1114112K
|
||||
class space used 2213K, committed 2432K, reserved 1048576K
|
||||
}
|
||||
Event: 2.808 GC heap before
|
||||
{Heap before GC invocations=3 (full 0):
|
||||
garbage-first heap total 114688K, used 69166K [0x0000000404000000, 0x0000000800000000)
|
||||
region size 8192K, 9 young (73728K), 1 survivors (8192K)
|
||||
Metaspace used 31863K, committed 32448K, reserved 1114112K
|
||||
class space used 3380K, committed 3648K, reserved 1048576K
|
||||
}
|
||||
Event: 2.810 GC heap after
|
||||
{Heap after GC invocations=4 (full 0):
|
||||
garbage-first heap total 114688K, used 15153K [0x0000000404000000, 0x0000000800000000)
|
||||
region size 8192K, 1 young (8192K), 1 survivors (8192K)
|
||||
Metaspace used 31863K, committed 32448K, reserved 1114112K
|
||||
class space used 3380K, committed 3648K, reserved 1048576K
|
||||
}
|
||||
|
||||
Dll operation events (2 events):
|
||||
Event: 0.005 Loaded shared library C:\Users\Dane Miller\AppData\Local\Programs\Rider 2\jbr\bin\java.dll
|
||||
Event: 0.009 Loaded shared library C:\Users\Dane Miller\AppData\Local\Programs\Rider 2\jbr\bin\zip.dll
|
||||
|
||||
Deoptimization events (20 events):
|
||||
Event: 2.810 Thread 0x00000247262dc070 Uncommon trap: trap_request=0xffffff45 fr.pc=0x0000024707c9e038 relative=0x00000000000037b8
|
||||
Event: 2.810 Thread 0x00000247262dc070 Uncommon trap: reason=unstable_if action=reinterpret pc=0x0000024707c9e038 method=java.lang.ref.ReferenceQueue.headIsNull()Z @ 4 c2
|
||||
Event: 2.810 Thread 0x00000247262d9fa0 DEOPT PACKING pc=0x0000024707c9e038 sp=0x0000004d82efe250
|
||||
Event: 2.810 Thread 0x00000247262d7840 DEOPT PACKING pc=0x0000024707c9e038 sp=0x0000004d85dfe660
|
||||
Event: 2.810 Thread 0x00000247262dc070 DEOPT PACKING pc=0x0000024707c9e038 sp=0x0000004d836fe160
|
||||
Event: 2.810 Thread 0x00000247262d7840 DEOPT UNPACKING pc=0x00000247074646a2 sp=0x0000004d85dfe4c8 mode 2
|
||||
Event: 2.810 Thread 0x00000247262dc070 DEOPT UNPACKING pc=0x00000247074646a2 sp=0x0000004d836fdfc8 mode 2
|
||||
Event: 2.810 Thread 0x00000247262d9fa0 DEOPT UNPACKING pc=0x00000247074646a2 sp=0x0000004d82efe0b8 mode 2
|
||||
Event: 2.813 Thread 0x0000024721b1ddb0 Uncommon trap: trap_request=0xffffff45 fr.pc=0x0000024707d5d584 relative=0x0000000000000684
|
||||
Event: 2.813 Thread 0x0000024721b1ddb0 Uncommon trap: reason=unstable_if action=reinterpret pc=0x0000024707d5d584 method=com.fasterxml.jackson.core.json.WriterBasedJsonGenerator._writeString2(I)V @ 21 c2
|
||||
Event: 2.813 Thread 0x0000024721b1ddb0 DEOPT PACKING pc=0x0000024707d5d584 sp=0x0000004d82dfe710
|
||||
Event: 2.813 Thread 0x0000024721b1ddb0 DEOPT UNPACKING pc=0x00000247074646a2 sp=0x0000004d82dfe620 mode 2
|
||||
Event: 2.813 Thread 0x0000024721b1ddb0 Uncommon trap: trap_request=0xffffff45 fr.pc=0x0000024707d56f50 relative=0x0000000000000290
|
||||
Event: 2.813 Thread 0x0000024721b1ddb0 Uncommon trap: reason=unstable_if action=reinterpret pc=0x0000024707d56f50 method=com.fasterxml.jackson.core.json.WriterBasedJsonGenerator._writeString2(I)V @ 21 c2
|
||||
Event: 2.813 Thread 0x0000024721b1ddb0 DEOPT PACKING pc=0x0000024707d56f50 sp=0x0000004d82dfe6a0
|
||||
Event: 2.813 Thread 0x0000024721b1ddb0 DEOPT UNPACKING pc=0x00000247074646a2 sp=0x0000004d82dfe620 mode 2
|
||||
Event: 2.843 Thread 0x0000024721b1ddb0 Uncommon trap: trap_request=0xffffff45 fr.pc=0x0000024707d80480 relative=0x00000000000008c0
|
||||
Event: 2.843 Thread 0x0000024721b1ddb0 Uncommon trap: reason=unstable_if action=reinterpret pc=0x0000024707d80480 method=com.fasterxml.jackson.core.json.WriterBasedJsonGenerator.writeString(Ljava/lang/String;)V @ 23 c2
|
||||
Event: 2.843 Thread 0x0000024721b1ddb0 DEOPT PACKING pc=0x0000024707d80480 sp=0x0000004d82dfe790
|
||||
Event: 2.843 Thread 0x0000024721b1ddb0 DEOPT UNPACKING pc=0x00000247074646a2 sp=0x0000004d82dfe6f0 mode 2
|
||||
|
||||
Classes loaded (20 events):
|
||||
Event: 2.754 Loading class java/util/zip/Deflater$DeflaterZStreamRef
|
||||
Event: 2.754 Loading class java/util/zip/Deflater$DeflaterZStreamRef done
|
||||
Event: 2.757 Loading class java/net/UnknownHostException
|
||||
Event: 2.757 Loading class java/net/UnknownHostException done
|
||||
Event: 2.758 Loading class java/nio/channels/UnresolvedAddressException
|
||||
Event: 2.758 Loading class java/nio/channels/UnresolvedAddressException done
|
||||
Event: 2.758 Loading class java/util/concurrent/CompletionException
|
||||
Event: 2.758 Loading class java/util/concurrent/CompletionException done
|
||||
Event: 2.759 Loading class java/util/concurrent/CancellationException
|
||||
Event: 2.759 Loading class java/util/concurrent/CancellationException done
|
||||
Event: 2.774 Loading class java/util/IdentityHashMap$KeyIterator
|
||||
Event: 2.774 Loading class java/util/IdentityHashMap$IdentityHashMapIterator
|
||||
Event: 2.774 Loading class java/util/IdentityHashMap$IdentityHashMapIterator done
|
||||
Event: 2.774 Loading class java/util/IdentityHashMap$KeyIterator done
|
||||
Event: 2.775 Loading class jdk/internal/math/DoubleToDecimal
|
||||
Event: 2.775 Loading class jdk/internal/math/DoubleToDecimal done
|
||||
Event: 2.775 Loading class jdk/internal/math/MathUtils
|
||||
Event: 2.775 Loading class jdk/internal/math/MathUtils done
|
||||
Event: 2.811 Loading class java/util/LinkedList$LLSpliterator
|
||||
Event: 2.811 Loading class java/util/LinkedList$LLSpliterator done
|
||||
|
||||
Classes unloaded (0 events):
|
||||
No events
|
||||
|
||||
Classes redefined (0 events):
|
||||
No events
|
||||
|
||||
Internal exceptions (20 events):
|
||||
Event: 1.929 Thread 0x00000247262c3fe0 Exception <a 'java/lang/NoSuchMethodError'{0x0000000443a32a28}: 'void java.lang.invoke.DirectMethodHandle$Holder.invokeInterface(java.lang.Object, java.lang.Object)'> (0x0000000443a32a28)
|
||||
thrown [s\src\hotspot\share\interpreter\linkResolver.cpp, line 784]
|
||||
Event: 1.929 Thread 0x00000247262c32c0 Exception <a 'java/lang/NoSuchMethodError'{0x0000000443948590}: 'void java.lang.invoke.DirectMethodHandle$Holder.invokeInterface(java.lang.Object, java.lang.Object)'> (0x0000000443948590)
|
||||
thrown [s\src\hotspot\share\interpreter\linkResolver.cpp, line 784]
|
||||
Event: 1.929 Thread 0x00000247262c4d00 Exception <a 'java/lang/NoSuchMethodError'{0x0000000443ce5ce0}: 'void java.lang.invoke.DirectMethodHandle$Holder.invokeInterface(java.lang.Object, java.lang.Object)'> (0x0000000443ce5ce0)
|
||||
thrown [s\src\hotspot\share\interpreter\linkResolver.cpp, line 784]
|
||||
Event: 1.929 Thread 0x00000247262c5390 Exception <a 'java/lang/NoSuchMethodError'{0x00000004438e64a8}: 'void java.lang.invoke.DirectMethodHandle$Holder.invokeInterface(java.lang.Object, java.lang.Object)'> (0x00000004438e64a8)
|
||||
thrown [s\src\hotspot\share\interpreter\linkResolver.cpp, line 784]
|
||||
Event: 2.084 Thread 0x00000247262c32c0 Exception <a 'java/lang/NoSuchMethodError'{0x0000000409f0e190}: 'void java.lang.invoke.DirectMethodHandle$Holder.invokeVirtual(java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object)'> (0x0000000409f0e190)
|
||||
thrown [s\src\hotspot\share\interpreter\linkResolver.cpp, line 784]
|
||||
Event: 2.084 Thread 0x00000247262c25a0 Exception <a 'java/lang/NoSuchMethodError'{0x0000000409eaf790}: 'void java.lang.invoke.DirectMethodHandle$Holder.invokeVirtual(java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object)'> (0x0000000409eaf790)
|
||||
thrown [s\src\hotspot\share\interpreter\linkResolver.cpp, line 784]
|
||||
Event: 2.182 Thread 0x00000247216e7ec0 Exception <a 'java/lang/NoSuchMethodError'{0x000000040888a4c0}: 'void java.lang.invoke.Invokers$Holder.invokeExact_MT(java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object)'> (0x000000040888a4c0)
|
||||
thrown [s\src\hotspot\share\interpreter\linkResolver.cpp, line 784]
|
||||
Event: 2.182 Thread 0x0000024721b1ddb0 Exception <a 'java/lang/NoSuchMethodError'{0x0000000408a3b9d0}: 'void java.lang.invoke.Invokers$Holder.invokeExact_MT(java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object)'> (0x0000000408a3b9d0)
|
||||
thrown [s\src\hotspot\share\interpreter\linkResolver.cpp, line 784]
|
||||
Event: 2.184 Thread 0x0000024721b1ddb0 Exception <a 'java/lang/NoSuchMethodError'{0x0000000408a54670}: 'void java.lang.invoke.DelegatingMethodHandle$Holder.reinvoke_L(java.lang.Object, java.lang.Object, int)'> (0x0000000408a54670)
|
||||
thrown [s\src\hotspot\share\interpreter\linkResolver.cpp, line 784]
|
||||
Event: 2.184 Thread 0x00000247216e7ec0 Exception <a 'java/lang/NoSuchMethodError'{0x000000040889dfd0}: 'void java.lang.invoke.DelegatingMethodHandle$Holder.reinvoke_L(java.lang.Object, java.lang.Object, int)'> (0x000000040889dfd0)
|
||||
thrown [s\src\hotspot\share\interpreter\linkResolver.cpp, line 784]
|
||||
Event: 2.185 Thread 0x0000024721b1ddb0 Exception <a 'java/lang/NoSuchMethodError'{0x0000000408a5a9c0}: 'void java.lang.invoke.Invokers$Holder.invokeExact_MT(java.lang.Object, java.lang.Object, int, java.lang.Object)'> (0x0000000408a5a9c0)
|
||||
thrown [s\src\hotspot\share\interpreter\linkResolver.cpp, line 784]
|
||||
Event: 2.185 Thread 0x00000247216e7ec0 Exception <a 'java/lang/NoSuchMethodError'{0x00000004088a4788}: 'void java.lang.invoke.Invokers$Holder.invokeExact_MT(java.lang.Object, java.lang.Object, int, java.lang.Object)'> (0x00000004088a4788)
|
||||
thrown [s\src\hotspot\share\interpreter\linkResolver.cpp, line 784]
|
||||
Event: 2.190 Thread 0x00000247216e7ec0 Exception <a 'java/lang/NoSuchMethodError'{0x0000000408acb700}: 'java.lang.Object java.lang.invoke.DirectMethodHandle$Holder.invokeSpecial(java.lang.Object, java.lang.Object, java.lang.Object, int, java.lang.Object)'> (0x0000000408acb700)
|
||||
thrown [s\src\hotspot\share\interpreter\linkResolver.cpp, line 784]
|
||||
Event: 2.190 Thread 0x0000024721b1ddb0 Exception <a 'java/lang/NoSuchMethodError'{0x0000000408aa0290}: 'java.lang.Object java.lang.invoke.DirectMethodHandle$Holder.invokeSpecial(java.lang.Object, java.lang.Object, java.lang.Object, int, java.lang.Object)'> (0x0000000408aa0290)
|
||||
thrown [s\src\hotspot\share\interpreter\linkResolver.cpp, line 784]
|
||||
Event: 2.190 Thread 0x00000247216e7ec0 Exception <a 'java/lang/NoSuchMethodError'{0x0000000408aced98}: 'java.lang.Object java.lang.invoke.Invokers$Holder.linkToTargetMethod(java.lang.Object, int, java.lang.Object, java.lang.Object)'> (0x0000000408aced98)
|
||||
thrown [s\src\hotspot\share\interpreter\linkResolver.cpp, line 784]
|
||||
Event: 2.190 Thread 0x0000024721b1ddb0 Exception <a 'java/lang/NoSuchMethodError'{0x0000000408aa3418}: 'java.lang.Object java.lang.invoke.Invokers$Holder.linkToTargetMethod(java.lang.Object, int, java.lang.Object, java.lang.Object)'> (0x0000000408aa3418)
|
||||
thrown [s\src\hotspot\share\interpreter\linkResolver.cpp, line 784]
|
||||
Event: 2.750 Thread 0x00000247216e7ec0 Exception <a 'java/lang/NoSuchMethodError'{0x0000000407f0a5c8}: 'java.lang.Object java.lang.invoke.DirectMethodHandle$Holder.newInvokeSpecial(java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object)'> (0x0000000407f0a5c8)
|
||||
thrown [s\src\hotspot\share\interpreter\linkResolver.cpp, line 784]
|
||||
Event: 2.757 Thread 0x00000247216e7ec0 Exception <a 'java/net/UnknownHostException'{0x0000000407f26330}> (0x0000000407f26330)
|
||||
thrown [s\src\hotspot\share\prims\jni.cpp, line 535]
|
||||
Event: 2.771 Thread 0x00000247216e7ec0 Exception <a 'java/io/IOException'{0x000000040736e390}> (0x000000040736e390)
|
||||
thrown [s\src\hotspot\share\prims\jni.cpp, line 535]
|
||||
Event: 2.774 Thread 0x00000247216e7ec0 Exception <a 'java/io/IOException'{0x00000004073867f8}> (0x00000004073867f8)
|
||||
thrown [s\src\hotspot\share\prims\jni.cpp, line 535]
|
||||
|
||||
ZGC Phase Switch (0 events):
|
||||
No events
|
||||
|
||||
VM Operations (20 events):
|
||||
Event: 2.161 Executing VM operation: HandshakeAllThreads (Deoptimize)
|
||||
Event: 2.161 Executing VM operation: HandshakeAllThreads (Deoptimize) done
|
||||
Event: 2.179 Executing VM operation: HandshakeAllThreads (Deoptimize)
|
||||
Event: 2.179 Executing VM operation: HandshakeAllThreads (Deoptimize) done
|
||||
Event: 2.546 Executing VM operation: ICBufferFull
|
||||
Event: 2.546 Executing VM operation: ICBufferFull done
|
||||
Event: 2.714 Executing VM operation: HandshakeAllThreads (Deoptimize)
|
||||
Event: 2.714 Executing VM operation: HandshakeAllThreads (Deoptimize) done
|
||||
Event: 2.718 Executing VM operation: HandshakeAllThreads (Deoptimize)
|
||||
Event: 2.718 Executing VM operation: HandshakeAllThreads (Deoptimize) done
|
||||
Event: 2.742 Executing VM operation: ICBufferFull
|
||||
Event: 2.742 Executing VM operation: ICBufferFull done
|
||||
Event: 2.748 Executing VM operation: HandshakeAllThreads (Deoptimize)
|
||||
Event: 2.748 Executing VM operation: HandshakeAllThreads (Deoptimize) done
|
||||
Event: 2.763 Executing VM operation: HandshakeAllThreads (Deoptimize)
|
||||
Event: 2.763 Executing VM operation: HandshakeAllThreads (Deoptimize) done
|
||||
Event: 2.794 Executing VM operation: ICBufferFull
|
||||
Event: 2.794 Executing VM operation: ICBufferFull done
|
||||
Event: 2.808 Executing VM operation: G1CollectForAllocation (G1 Evacuation Pause)
|
||||
Event: 2.810 Executing VM operation: G1CollectForAllocation (G1 Evacuation Pause) done
|
||||
|
||||
Events (20 events):
|
||||
Event: 2.807 Thread 0x00000247262d9280 Thread added: 0x00000247262d9280
|
||||
Event: 2.807 Thread 0x00000247262d9910 Thread added: 0x00000247262d9910
|
||||
Event: 2.807 Thread 0x00000247262dcd90 Thread added: 0x00000247262dcd90
|
||||
Event: 2.812 Thread 0x00000247262d7ed0 Thread exited: 0x00000247262d7ed0
|
||||
Event: 2.812 Thread 0x00000247262d9fa0 Thread exited: 0x00000247262d9fa0
|
||||
Event: 2.812 Thread 0x00000247262d8bf0 Thread exited: 0x00000247262d8bf0
|
||||
Event: 2.813 Thread 0x00000247262dc070 Thread exited: 0x00000247262dc070
|
||||
Event: 2.813 Thread 0x00000247262d7840 Thread exited: 0x00000247262d7840
|
||||
Event: 2.813 Thread 0x00000247262d8560 Thread exited: 0x00000247262d8560
|
||||
Event: 2.813 Thread 0x00000247262dacc0 Thread exited: 0x00000247262dacc0
|
||||
Event: 2.813 Thread 0x00000247262db9e0 Thread exited: 0x00000247262db9e0
|
||||
Event: 2.813 Thread 0x00000247262db350 Thread exited: 0x00000247262db350
|
||||
Event: 2.816 Thread 0x00000247262da630 Thread added: 0x00000247262da630
|
||||
Event: 2.826 Thread 0x00000247262dc700 Thread added: 0x00000247262dc700
|
||||
Event: 2.826 Thread 0x00000247262d6b20 Thread added: 0x00000247262d6b20
|
||||
Event: 2.827 Thread 0x00000247262dd420 Thread added: 0x00000247262dd420
|
||||
Event: 2.827 Thread 0x00000247262d7840 Thread added: 0x00000247262d7840
|
||||
Event: 2.827 Thread 0x00000247262dc070 Thread added: 0x00000247262dc070
|
||||
Event: 2.827 Thread 0x00000247262ddab0 Thread added: 0x00000247262ddab0
|
||||
Event: 2.846 Thread 0x00000247262dacc0 Thread added: 0x00000247262dacc0
|
||||
|
||||
|
||||
Dynamic libraries:
|
||||
0x00007ff6adff0000 - 0x00007ff6adffa000 C:\Users\Dane Miller\AppData\Local\Programs\Rider 2\jbr\bin\java.exe
|
||||
0x00007ffcb6a90000 - 0x00007ffcb6ca7000 C:\Windows\SYSTEM32\ntdll.dll
|
||||
0x00007ffcb5330000 - 0x00007ffcb53f4000 C:\Windows\System32\KERNEL32.DLL
|
||||
0x00007ffcb3ff0000 - 0x00007ffcb439d000 C:\Windows\System32\KERNELBASE.dll
|
||||
0x00007ffcb4680000 - 0x00007ffcb4791000 C:\Windows\System32\ucrtbase.dll
|
||||
0x00007ffca4100000 - 0x00007ffca411b000 C:\Users\Dane Miller\AppData\Local\Programs\Rider 2\jbr\bin\VCRUNTIME140.dll
|
||||
0x00007ffca3ff0000 - 0x00007ffca4008000 C:\Users\Dane Miller\AppData\Local\Programs\Rider 2\jbr\bin\jli.dll
|
||||
0x00007ffcb5dc0000 - 0x00007ffcb5f6e000 C:\Windows\System32\USER32.dll
|
||||
0x00007ffcb47a0000 - 0x00007ffcb47c6000 C:\Windows\System32\win32u.dll
|
||||
0x00007ffcb5010000 - 0x00007ffcb5039000 C:\Windows\System32\GDI32.dll
|
||||
0x00007ffcb3e30000 - 0x00007ffcb3f49000 C:\Windows\System32\gdi32full.dll
|
||||
0x00007ffc9b8d0000 - 0x00007ffc9bb63000 C:\Windows\WinSxS\amd64_microsoft.windows.common-controls_6595b64144ccf1df_6.0.22621.3672_none_2713b9d173822955\COMCTL32.dll
|
||||
0x00007ffcb3f50000 - 0x00007ffcb3fea000 C:\Windows\System32\msvcp_win.dll
|
||||
0x00007ffcb47d0000 - 0x00007ffcb4877000 C:\Windows\System32\msvcrt.dll
|
||||
0x00007ffcb5980000 - 0x00007ffcb59b1000 C:\Windows\System32\IMM32.DLL
|
||||
0x00007ffca40f0000 - 0x00007ffca40fc000 C:\Users\Dane Miller\AppData\Local\Programs\Rider 2\jbr\bin\vcruntime140_1.dll
|
||||
0x00007ffca3cc0000 - 0x00007ffca3d4d000 C:\Users\Dane Miller\AppData\Local\Programs\Rider 2\jbr\bin\msvcp140.dll
|
||||
0x00007ffc263f0000 - 0x00007ffc271a2000 C:\Users\Dane Miller\AppData\Local\Programs\Rider 2\jbr\bin\server\jvm.dll
|
||||
0x00007ffcb4890000 - 0x00007ffcb4942000 C:\Windows\System32\ADVAPI32.dll
|
||||
0x00007ffcb5140000 - 0x00007ffcb51e9000 C:\Windows\System32\sechost.dll
|
||||
0x00007ffcb44e0000 - 0x00007ffcb4508000 C:\Windows\System32\bcrypt.dll
|
||||
0x00007ffcb60d0000 - 0x00007ffcb61e4000 C:\Windows\System32\RPCRT4.dll
|
||||
0x00007ffcb49e0000 - 0x00007ffcb4a51000 C:\Windows\System32\WS2_32.dll
|
||||
0x00007ffcaa120000 - 0x00007ffcaa154000 C:\Windows\SYSTEM32\WINMM.dll
|
||||
0x00007ffcacca0000 - 0x00007ffcaccaa000 C:\Windows\SYSTEM32\VERSION.dll
|
||||
0x00007ffcb2c10000 - 0x00007ffcb2c5d000 C:\Windows\SYSTEM32\POWRPROF.dll
|
||||
0x00007ffcb2bf0000 - 0x00007ffcb2c03000 C:\Windows\SYSTEM32\UMPDC.dll
|
||||
0x00007ffcb2e40000 - 0x00007ffcb2e58000 C:\Windows\SYSTEM32\kernel.appcore.dll
|
||||
0x00007ffca4020000 - 0x00007ffca402a000 C:\Users\Dane Miller\AppData\Local\Programs\Rider 2\jbr\bin\jimage.dll
|
||||
0x00007ffcb1100000 - 0x00007ffcb1332000 C:\Windows\SYSTEM32\DBGHELP.DLL
|
||||
0x00007ffcb4a60000 - 0x00007ffcb4de8000 C:\Windows\System32\combase.dll
|
||||
0x00007ffcb51f0000 - 0x00007ffcb52c7000 C:\Windows\System32\OLEAUT32.dll
|
||||
0x00007ffcabe80000 - 0x00007ffcabeb2000 C:\Windows\SYSTEM32\dbgcore.DLL
|
||||
0x00007ffcb43a0000 - 0x00007ffcb441b000 C:\Windows\System32\bcryptPrimitives.dll
|
||||
0x00007ffc8d350000 - 0x00007ffc8d36f000 C:\Users\Dane Miller\AppData\Local\Programs\Rider 2\jbr\bin\java.dll
|
||||
0x00007ffc8d330000 - 0x00007ffc8d348000 C:\Users\Dane Miller\AppData\Local\Programs\Rider 2\jbr\bin\zip.dll
|
||||
0x00007ffcb61f0000 - 0x00007ffcb6a4f000 C:\Windows\System32\SHELL32.dll
|
||||
0x00007ffcb1cd0000 - 0x00007ffcb25cc000 C:\Windows\SYSTEM32\windows.storage.dll
|
||||
0x00007ffcb1b90000 - 0x00007ffcb1ccf000 C:\Windows\SYSTEM32\wintypes.dll
|
||||
0x00007ffcb4df0000 - 0x00007ffcb4ee4000 C:\Windows\System32\SHCORE.dll
|
||||
0x00007ffcb59d0000 - 0x00007ffcb5a2e000 C:\Windows\System32\shlwapi.dll
|
||||
0x00007ffcb3cf0000 - 0x00007ffcb3d11000 C:\Windows\SYSTEM32\profapi.dll
|
||||
0x00007ffca4010000 - 0x00007ffca4020000 C:\Users\Dane Miller\AppData\Local\Programs\Rider 2\jbr\bin\net.dll
|
||||
0x00007ffcae420000 - 0x00007ffcae556000 C:\Windows\SYSTEM32\WINHTTP.dll
|
||||
0x00007ffcb3300000 - 0x00007ffcb3369000 C:\Windows\system32\mswsock.dll
|
||||
0x00007ffc8d310000 - 0x00007ffc8d326000 C:\Users\Dane Miller\AppData\Local\Programs\Rider 2\jbr\bin\nio.dll
|
||||
0x00007ffc87360000 - 0x00007ffc8736e000 C:\Users\Dane Miller\AppData\Local\Programs\Rider 2\jbr\bin\sunmscapi.dll
|
||||
0x00007ffcb4510000 - 0x00007ffcb4677000 C:\Windows\System32\CRYPT32.dll
|
||||
0x00007ffcb3750000 - 0x00007ffcb377e000 C:\Windows\SYSTEM32\ncrypt.dll
|
||||
0x00007ffcb3710000 - 0x00007ffcb3747000 C:\Windows\SYSTEM32\NTASN1.dll
|
||||
0x00007ffcb3650000 - 0x00007ffcb366b000 C:\Windows\SYSTEM32\CRYPTSP.dll
|
||||
0x00007ffcb2e00000 - 0x00007ffcb2e35000 C:\Windows\system32\rsaenh.dll
|
||||
0x00007ffcb33a0000 - 0x00007ffcb33c8000 C:\Windows\SYSTEM32\USERENV.dll
|
||||
0x00007ffcb3630000 - 0x00007ffcb363c000 C:\Windows\SYSTEM32\CRYPTBASE.dll
|
||||
0x00007ffcb28a0000 - 0x00007ffcb28cd000 C:\Windows\SYSTEM32\IPHLPAPI.DLL
|
||||
0x00007ffcb5400000 - 0x00007ffcb5409000 C:\Windows\System32\NSI.dll
|
||||
0x00007ffc47010000 - 0x00007ffc47018000 C:\Windows\system32\wshunix.dll
|
||||
0x00007ffc86ae0000 - 0x00007ffc86ae9000 C:\Users\Dane Miller\AppData\Local\Programs\Rider 2\jbr\bin\extnet.dll
|
||||
0x00007ffcb2910000 - 0x00007ffcb2a08000 C:\Windows\SYSTEM32\DNSAPI.dll
|
||||
0x000000006e060000 - 0x000000006e086000 C:\Program Files\Bonjour\mdnsNSP.dll
|
||||
0x00007ffcaaef0000 - 0x00007ffcaaefa000 C:\Windows\System32\rasadhlp.dll
|
||||
0x00007ffcad8b0000 - 0x00007ffcad933000 C:\Windows\System32\fwpuclnt.dll
|
||||
|
||||
dbghelp: loaded successfully - version: 4.0.5 - missing functions: none
|
||||
symbol engine: initialized successfully - sym options: 0x614 - pdb path: .;C:\Users\Dane Miller\AppData\Local\Programs\Rider 2\jbr\bin;C:\Windows\SYSTEM32;C:\Windows\WinSxS\amd64_microsoft.windows.common-controls_6595b64144ccf1df_6.0.22621.3672_none_2713b9d173822955;C:\Users\Dane Miller\AppData\Local\Programs\Rider 2\jbr\bin\server;C:\Program Files\Bonjour
|
||||
|
||||
VM Arguments:
|
||||
jvm_args: -Djava.io.tmpdir=C:\Users\Dane Miller\AppData\Local\JetBrains\Rider2024.2\tmp\statistics-uploader
|
||||
java_command: com.intellij.internal.statistic.uploader.EventLogUploader --ide-token C:\Users\Dane Miller\AppData\Local\JetBrains\Rider2024.2\token --recorders MLSE;FUS;MP;IJ_MAP;ML --device-mlse 080724136b469d9-f004-45dd-9a33-fc9c139518a7 --bucket-mlse 250 --machine-mlse 39000c1408aca13ea15e72b100d97d005acf511b106e6b9f76428957b22ec297 --id-revision-mlse 0 --files-mlse C:\Users\Dane Miller\AppData\Local\JetBrains\Rider2024.2\event-log-data\logs\MLSE\5d7a-4f98-992d-d52cf709442a-242.19890.25-eap.log;C:\Users\Dane Miller\AppData\Local\JetBrains\Rider2024.2\event-log-data\logs\MLSE\7e03-4461-be3c-5eabe7f331f0-242.19890.25-eap.log --escape-mlse true --device-fus 02052413dcabcdb-1556-4ca6-adcc-6b807e280d56 --bucket-fus 161 --machine-fus eedbb782e320b4037fc38827ddb3b1faec6645f615308fbf4c1c0699c6164ef7 --id-revision-fus 0 --files-fus C:\Users\Dane Miller\AppData\Local\JetBrains\Rider2024.2\event-log-data\logs\FUS\0951-45db-bb4c-14a7b8d20f03-242.19890.25-eap.log;C:\Users\Dane Miller\AppData\Local\JetBrains\Rider2024.2\event-log-data\logs\FUS\21a9-488f-b0d8-8d92d8132570-242.19890.25-eap.log;C:\Users\Dane Miller\AppData\Local\JetBrains\Rider2024.2\event-log-data\logs\FUS\2c51-4bdc-bbd7-aad442979a7a-242.19890.25-eap.log;C:\Users\Dane Miller\AppData\Local\JetBrains\Rider2024.2\event-log-data\logs\FUS\3d2d-4431-8e64-2a9ad75aa8c9-242.19890.25-eap.log;C:\Users\Dane Miller\AppData\Local\JetBrains\Rider2024.2\event-log-data\logs\FUS\480b-4037-b9a5-928d67a0dbea-242.19890.25-eap.log --escape-fus true --device-mp 02052412f99d35d-0f16-4a52-9de8-9c105a40ede0 --bucket-mp 6 --machine-mp c2686f73dec193db99140ae531da40a49840cf0973d73822b970be502d4ca3ee --id-revision-mp 0 --files-mp C:\Users\Dane Miller\AppData\Local\JetBrains\Rider2024.2\event-log-data\logs\MP\7744-4e52-84c1-90077ae93329-242.19890.25-eap.log;C:\Users\Dane Miller\AppData\Local\JetBrains\Rider2024.2\event-log-data\logs\MP\dd31-4033-9767-1ae238ed199f-242.19890.25-eap.log --escape-mp true --device-ij_map 08072415eb3f526-7d35-4b1
|
||||
java_class_path (initial): C:\Users\Dane Miller\AppData\Local\Programs\Rider 2\lib\util-8.jar;C:\Users\Dane Miller\AppData\Local\Programs\Rider 2\lib\annotations.jar;C:\Users\Dane Miller\AppData\Local\Programs\Rider 2\lib\lib-client.jar;C:\Users\Dane Miller\AppData\Local\Programs\Rider 2\lib\stats.jar
|
||||
Launcher Type: SUN_STANDARD
|
||||
|
||||
[Global flags]
|
||||
intx CICompilerCount = 15 {product} {ergonomic}
|
||||
uint ConcGCThreads = 6 {product} {ergonomic}
|
||||
uint G1ConcRefinementThreads = 23 {product} {ergonomic}
|
||||
size_t G1HeapRegionSize = 8388608 {product} {ergonomic}
|
||||
uintx GCDrainStackTargetSize = 64 {product} {ergonomic}
|
||||
size_t InitialHeapSize = 1073741824 {product} {ergonomic}
|
||||
size_t MarkStackSize = 4194304 {product} {ergonomic}
|
||||
size_t MaxHeapSize = 17112760320 {product} {ergonomic}
|
||||
size_t MaxNewSize = 10267656192 {product} {ergonomic}
|
||||
size_t MinHeapDeltaBytes = 8388608 {product} {ergonomic}
|
||||
size_t MinHeapSize = 8388608 {product} {ergonomic}
|
||||
uintx NonNMethodCodeHeapSize = 8192380 {pd product} {ergonomic}
|
||||
uintx NonProfiledCodeHeapSize = 121732930 {pd product} {ergonomic}
|
||||
uintx ProfiledCodeHeapSize = 121732930 {pd product} {ergonomic}
|
||||
uintx ReservedCodeCacheSize = 251658240 {pd product} {ergonomic}
|
||||
bool SegmentedCodeCache = true {product} {ergonomic}
|
||||
size_t SoftMaxHeapSize = 17112760320 {manageable} {ergonomic}
|
||||
bool UseCompressedOops = true {product lp64_product} {ergonomic}
|
||||
bool UseG1GC = true {product} {ergonomic}
|
||||
bool UseLargePagesIndividualAllocation = false {pd product} {ergonomic}
|
||||
|
||||
Logging:
|
||||
Log output configuration:
|
||||
#0: stdout all=warning uptime,level,tags foldmultilines=false
|
||||
#1: stderr all=off uptime,level,tags foldmultilines=false
|
||||
|
||||
Environment Variables:
|
||||
PATH=C:\Program Files (x86)\Razer\ChromaBroadcast\bin;C:\Program Files\Razer\ChromaBroadcast\bin;C:\Python312\Scripts\;C:\Python312\;C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem;C:\Windows\System32\WindowsPowerShell\v1.0\;C:\Windows\System32\OpenSSH\;C:\Program Files\dotnet\;C:\ProgramData\chocolatey\bin;C:\Program Files\Git\cmd;C:\Program Files\nodejs\;C:\Program Files\PowerShell\7\;C:\Program Files (x86)\Paragon Software\LinuxFS for Windows\;C:\Users\Dane Miller\AppData\Roaming\Python\Python312\site-packages
;C:\Windows\system32\config\systemprofile\AppData\Local\Microsoft\WindowsApps;;C:\Program Files\Docker\Docker\resources\bin;C:\Program Files\Go\bin;C:\TDM-GCC-64\bin;C:\Program Files (x86)\NVIDIA Corporation\PhysX\Common;C:\Program Files\NVIDIA Corporation\NVIDIA NvDLISR;C:\Users\Dane Miller\scoop\shims;C:\Users\Dane Miller\AppData\Local\Microsoft\WindowsApps;C:\Program Files\Neovim\bin;C:\Users\Dane Miller\AppData\Roaming\npm;C:\Users\Dane Miller\AppData\Local\spicetify;C:\Users\Dane Miller\AppData\Roaming\Python\Python312\site-packages
;C:\Users\Dane Miller\AppData\Local\Microsoft\WinGet\Packages\GnuWin32.Which_Microsoft.Winget.Source_8wekyb3d8bbwe\bin;C:\Users\Dane Miller\go\bin;C:\Users\Dane Miller\AppData\Local\JetBrains\Toolbox\scripts;
|
||||
USERNAME=Dane Miller
|
||||
OS=Windows_NT
|
||||
PROCESSOR_IDENTIFIER=Intel64 Family 6 Model 183 Stepping 1, GenuineIntel
|
||||
TMP=C:\Users\DANEMI~1\AppData\Local\Temp
|
||||
TEMP=C:\Users\DANEMI~1\AppData\Local\Temp
|
||||
|
||||
|
||||
|
||||
|
||||
Periodic native trim disabled
|
||||
|
||||
JNI global refs:
|
||||
JNI global refs: 38, weak refs: 0
|
||||
|
||||
JNI global refs memory usage: 835, weak refs: 833
|
||||
|
||||
Process memory usage:
|
||||
Resident Set Size: 283472K (0% of 66839704K total physical memory with 45081344K free physical memory)
|
||||
|
||||
OOME stack traces (most recent first):
|
||||
Classloader memory used:
|
||||
Loader bootstrap : 22208K
|
||||
Loader jdk.internal.loader.ClassLoaders$AppClassLoader : 7186K
|
||||
Loader jdk.internal.loader.ClassLoaders$PlatformClassLoader : 2698K
|
||||
|
||||
--------------- S Y S T E M ---------------
|
||||
|
||||
OS:
|
||||
Windows 11 , 64 bit Build 22621 (10.0.22621.3672)
|
||||
OS uptime: 0 days 0:33 hours
|
||||
Hyper-V role detected
|
||||
|
||||
CPU: total 32 (initial active 32) (16 cores per cpu, 2 threads per core) family 6 model 183 stepping 1 microcode 0x10c, cx8, cmov, fxsr, ht, mmx, 3dnowpref, sse, sse2, sse3, ssse3, sse4.1, sse4.2, popcnt, lzcnt, tsc, tscinvbit, avx, avx2, aes, erms, clmul, bmi1, bmi2, adx, sha, fma, vzeroupper, clflush, clflushopt, clwb, hv, serialize, rdtscp, rdpid, fsrm, f16c, cet_ibt, cet_ss
|
||||
Processor Information for all 32 processors :
|
||||
Max Mhz: 3000, Current Mhz: 3000, Mhz Limit: 3000
|
||||
|
||||
Memory: 4k page, system-wide physical 65273M (44021M free)
|
||||
TotalPageFile size 75001M (AvailPageFile size 49287M)
|
||||
current process WorkingSet (physical memory assigned to process): 277M, peak: 281M
|
||||
current process commit charge ("private bytes"): 363M, peak: 1199M
|
||||
|
||||
vm_info: OpenJDK 64-Bit Server VM (21.0.3+13-b509.4) for windows-amd64 JRE (21.0.3+13-b509.4), built on 2024-06-26 by "builduser" with MS VC++ 16.10 / 16.11 (VS2019)
|
||||
|
||||
END.
|
||||
File diff suppressed because one or more lines are too long
Loading…
Reference in New Issue