123

assets/script/run/bag/dai_dao_ju_bag.ts

@@ -90,7 +90,6 @@ export class dai_dao_ju_bag extends Component {
             }
         })
         this.mScrollView = gameManager.Singleton.getCurSceneLayerPage().getBG()
-        this.action_node.position
     }
 
     protected update(dt: number): void {

assets/script/run/lib.meta

@@ -2,11 +2,7 @@
   "ver": "1.2.0",
   "importer": "directory",
   "imported": true,
-<<<<<<< HEAD
-  "uuid": "d89b1952-912c-480b-a642-9e4bee841387",
-=======
-  "uuid": "bdbb0159-b184-498b-ba60-bbb42a2a202a",
->>>>>>> 3207335c2a1846853c1847a3e4aebf47a9421f78
+  "uuid": "9912f48c-cfd4-41fc-8894-786584c51b9f",
   "files": [],
   "subMetas": {},
   "userData": {}

assets/script/run/lib/Coroutine.ts.meta

@@ -2,11 +2,7 @@
   "ver": "4.0.23",
   "importer": "typescript",
   "imported": true,
-<<<<<<< HEAD
-  "uuid": "01acecce-ded3-434e-9457-05383e6ed68f",
-=======
-  "uuid": "628d2000-0b52-4719-912a-18e78dc6788a",
->>>>>>> 3207335c2a1846853c1847a3e4aebf47a9421f78
+  "uuid": "6b5262e8-e8d0-4812-9b9b-807cf253b26f",
   "files": [],
   "subMetas": {},
   "userData": {}