棋盘逻辑整理

assets/bundle/Icons.meta

@@ -0,0 +1,13 @@
+{
+  "ver": "1.1.3",
+  "uuid": "3c244ed5-c0fe-4808-aa1c-4961c96b53c1",
+  "importer": "folder",
+  "isBundle": false,
+  "bundleName": "",
+  "priority": 1,
+  "compressionType": {},
+  "optimizeHotUpdate": {},
+  "inlineSpriteFrames": {},
+  "isRemoteBundle": {},
+  "subMetas": {}
+}

assets/json/attrAttr.json

@@ -0,0 +1,33 @@
+[
+  {"id":100,"name":"hp","showName":"生命","attrDesc":"基础生命","numType":0,"upper":0,"icon":"","powerConversion":1},
+  {"id":101,"name":"atk","showName":"攻击","attrDesc":"基础攻击","numType":0,"upper":0,"icon":"","powerConversion":1},
+  {"id":102,"name":"def","showName":"防御","attrDesc":"基础防御","numType":0,"upper":0,"icon":"","powerConversion":1},
+  {"id":103,"name":"atkSpeed","showName":"攻速","attrDesc":"攻击速度","numType":0,"upper":0,"icon":"","powerConversion":1},
+  {"id":120,"name":"doubleHit","showName":"连击","attrDesc":"连击","numType":1,"upper":0,"icon":"","powerConversion":1},
+  {"id":121,"name":"crit","showName":"暴击","attrDesc":"暴击","numType":1,"upper":0,"icon":"","powerConversion":1},
+  {"id":122,"name":"verti","showName":"击晕","attrDesc":"击晕","numType":1,"upper":0,"icon":"","powerConversion":1},
+  {"id":123,"name":"eva","showName":"闪避","attrDesc":"闪避","numType":1,"upper":0,"icon":"","powerConversion":1},
+  {"id":124,"name":"counter","showName":"反击","attrDesc":"反击","numType":1,"upper":0,"icon":"","powerConversion":1},
+  {"id":125,"name":"lifesteal","showName":"普攻吸血","attrDesc":"普攻吸血","numType":1,"upper":0,"icon":"","powerConversion":1},
+  {"id":130,"name":"doubleHitRes","showName":"连击抵抗","attrDesc":"连击抵抗","numType":1,"upper":0,"icon":"","powerConversion":1},
+  {"id":131,"name":"critRes","showName":"暴击抵抗","attrDesc":"暴击抵抗","numType":1,"upper":0,"icon":"","powerConversion":1},
+  {"id":132,"name":"vertigoRes","showName":"击晕抵抗","attrDesc":"击晕抵抗","numType":1,"upper":0,"icon":"","powerConversion":1},
+  {"id":133,"name":"evaRes","showName":"闪避抵抗","attrDesc":"闪避抵抗","numType":1,"upper":0,"icon":"","powerConversion":1},
+  {"id":134,"name":"counterRes","showName":"反击抵抗","attrDesc":"反击抵抗","numType":1,"upper":0,"icon":"","powerConversion":1},
+  {"id":135,"name":"lifestealRes","showName":"吸血抵抗","attrDesc":"吸血抵抗","numType":1,"upper":0,"icon":"","powerConversion":1},
+  {"id":150,"name":"critDmgFac","showName":"暴击伤害","attrDesc":"暴击伤害","numType":1,"upper":0,"icon":"","powerConversion":1},
+  {"id":151,"name":"critDmgRes","showName":"暴击减伤","attrDesc":"暴击减伤","numType":1,"upper":0,"icon":"","powerConversion":1},
+  {"id":152,"name":"dmgFac","showName":"增伤","attrDesc":"伤害增加","numType":1,"upper":0,"icon":"","powerConversion":1},
+  {"id":153,"name":"dmgRes","showName":"减伤","attrDesc":"伤害减免","numType":1,"upper":0,"icon":"","powerConversion":1},
+  {"id":160,"name":"PVPDmgFac","showName":"PVP增伤","attrDesc":"PVP增伤","numType":1,"upper":0,"icon":"","powerConversion":1},
+  {"id":161,"name":"PVPDmgRes","showName":"PVP减伤","attrDesc":"PVP减伤","numType":1,"upper":0,"icon":"","powerConversion":1},
+  {"id":162,"name":"PVPRes","showName":"PVP抗性","attrDesc":"PVP抗性","numType":1,"upper":0,"icon":"","powerConversion":1},
+  {"id":400,"name":"hpAdd","showName":"生命加成","attrDesc":"基础生命加成","numType":1,"upper":0,"icon":"","powerConversion":0},
+  {"id":401,"name":"atkAdd","showName":"攻击加成","attrDesc":"基础攻击加成","numType":1,"upper":0,"icon":"","powerConversion":0},
+  {"id":402,"name":"defAdd","showName":"防御加成","attrDesc":"基础防御加成","numType":1,"upper":0,"icon":"","powerConversion":0},
+  {"id":403,"name":"atkSpeedAdd","showName":"攻速加成","attrDesc":"攻击速度加成","numType":1,"upper":0,"icon":"","powerConversion":0},
+  {"id":500,"name":"hpTotal","showName":"最终生命","attrDesc":"最终生命(生命上限)","numType":0,"upper":0,"icon":"","powerConversion":0},
+  {"id":501,"name":"atkTotal","showName":"最终攻击","attrDesc":"最终攻击","numType":0,"upper":0,"icon":"","powerConversion":0},
+  {"id":502,"name":"defTotal","showName":"最终防御","attrDesc":"最终防御","numType":0,"upper":0,"icon":"","powerConversion":0},
+  {"id":503,"name":"atkSpeedTotal","showName":"最终攻速","attrDesc":"最终攻速","numType":0,"upper":0,"icon":"","powerConversion":0}
+]

assets/json/attrAttr.json.meta

@@ -0,0 +1,6 @@
+{
+  "ver": "1.0.2",
+  "uuid": "b238260e-167a-4688-93a3-06dfe79101a2",
+  "importer": "json",
+  "subMetas": {}
+}

assets/json/chapterLayout.json

@@ -1,40 +1,40 @@
 [
-  {"id":10001,"infoId":1,"grid":11,"type":3,"correlationId":10001},
-  {"id":10002,"infoId":1,"grid":12,"type":3,"correlationId":10002},
-  {"id":10003,"infoId":1,"grid":13,"type":3,"correlationId":10003},
-  {"id":10004,"infoId":1,"grid":15,"type":3,"correlationId":10004},
-  {"id":10005,"infoId":1,"grid":16,"type":3,"correlationId":10005},
-  {"id":10006,"infoId":1,"grid":22,"type":3,"correlationId":10006},
-  {"id":10007,"infoId":1,"grid":23,"type":3,"correlationId":10007},
-  {"id":10008,"infoId":1,"grid":25,"type":3,"correlationId":10008},
-  {"id":10009,"infoId":1,"grid":26,"type":3,"correlationId":10009},
-  {"id":10010,"infoId":1,"grid":31,"type":3,"correlationId":10010},
-  {"id":10011,"infoId":1,"grid":32,"type":3,"correlationId":10011},
-  {"id":10012,"infoId":1,"grid":34,"type":3,"correlationId":10012},
-  {"id":10013,"infoId":1,"grid":36,"type":3,"correlationId":10013},
-  {"id":10014,"infoId":1,"grid":41,"type":3,"correlationId":10014},
-  {"id":10015,"infoId":1,"grid":42,"type":3,"correlationId":10015},
-  {"id":10016,"infoId":1,"grid":43,"type":3,"correlationId":10016},
-  {"id":10017,"infoId":1,"grid":44,"type":3,"correlationId":10017},
-  {"id":10018,"infoId":1,"grid":46,"type":3,"correlationId":10018},
-  {"id":10019,"infoId":1,"grid":53,"type":3,"correlationId":10019},
-  {"id":20001,"infoId":2,"grid":11,"type":3,"correlationId":10020},
-  {"id":20002,"infoId":2,"grid":12,"type":3,"correlationId":10001},
-  {"id":20003,"infoId":2,"grid":13,"type":3,"correlationId":10002},
-  {"id":20004,"infoId":2,"grid":15,"type":3,"correlationId":10003},
-  {"id":20005,"infoId":2,"grid":16,"type":3,"correlationId":10004},
-  {"id":20006,"infoId":2,"grid":22,"type":3,"correlationId":10005},
-  {"id":20007,"infoId":2,"grid":23,"type":3,"correlationId":10006},
-  {"id":20008,"infoId":2,"grid":25,"type":3,"correlationId":10007},
-  {"id":20009,"infoId":2,"grid":26,"type":3,"correlationId":10008},
-  {"id":20010,"infoId":2,"grid":31,"type":3,"correlationId":10009},
-  {"id":20011,"infoId":2,"grid":32,"type":3,"correlationId":10010},
-  {"id":20012,"infoId":2,"grid":34,"type":3,"correlationId":10011},
-  {"id":20013,"infoId":2,"grid":36,"type":3,"correlationId":10012},
-  {"id":20014,"infoId":2,"grid":41,"type":3,"correlationId":10013},
-  {"id":20015,"infoId":2,"grid":42,"type":3,"correlationId":10014},
-  {"id":20016,"infoId":2,"grid":43,"type":3,"correlationId":10015},
-  {"id":20017,"infoId":2,"grid":44,"type":3,"correlationId":10016},
-  {"id":20018,"infoId":2,"grid":46,"type":3,"correlationId":10017},
-  {"id":20019,"infoId":2,"grid":53,"type":3,"correlationId":10018}
+  {"id":10001,"infoId":1,"grid":11,"type":3,"correlationId":10001,"unlock":0},
+  {"id":10002,"infoId":1,"grid":12,"type":3,"correlationId":10002,"unlock":0},
+  {"id":10003,"infoId":1,"grid":13,"type":3,"correlationId":10003,"unlock":0},
+  {"id":10004,"infoId":1,"grid":15,"type":3,"correlationId":10004,"unlock":0},
+  {"id":10005,"infoId":1,"grid":16,"type":3,"correlationId":10005,"unlock":0},
+  {"id":10006,"infoId":1,"grid":22,"type":3,"correlationId":10006,"unlock":0},
+  {"id":10007,"infoId":1,"grid":23,"type":3,"correlationId":10007,"unlock":0},
+  {"id":10008,"infoId":1,"grid":25,"type":3,"correlationId":10008,"unlock":0},
+  {"id":10009,"infoId":1,"grid":26,"type":3,"correlationId":10009,"unlock":0},
+  {"id":10010,"infoId":1,"grid":31,"type":3,"correlationId":10010,"unlock":0},
+  {"id":10011,"infoId":1,"grid":32,"type":3,"correlationId":10011,"unlock":0},
+  {"id":10012,"infoId":1,"grid":34,"type":3,"correlationId":10012,"unlock":0},
+  {"id":10013,"infoId":1,"grid":36,"type":3,"correlationId":10013,"unlock":0},
+  {"id":10014,"infoId":1,"grid":41,"type":3,"correlationId":10014,"unlock":0},
+  {"id":10015,"infoId":1,"grid":42,"type":3,"correlationId":10015,"unlock":0},
+  {"id":10016,"infoId":1,"grid":43,"type":3,"correlationId":10016,"unlock":0},
+  {"id":10017,"infoId":1,"grid":44,"type":3,"correlationId":10017,"unlock":0},
+  {"id":10018,"infoId":1,"grid":46,"type":3,"correlationId":10018,"unlock":0},
+  {"id":10019,"infoId":1,"grid":53,"type":3,"correlationId":10019,"unlock":0},
+  {"id":20001,"infoId":2,"grid":11,"type":3,"correlationId":10020,"unlock":0},
+  {"id":20002,"infoId":2,"grid":12,"type":3,"correlationId":10001,"unlock":0},
+  {"id":20003,"infoId":2,"grid":13,"type":3,"correlationId":10002,"unlock":0},
+  {"id":20004,"infoId":2,"grid":15,"type":3,"correlationId":10003,"unlock":0},
+  {"id":20005,"infoId":2,"grid":16,"type":3,"correlationId":10004,"unlock":0},
+  {"id":20006,"infoId":2,"grid":22,"type":3,"correlationId":10005,"unlock":0},
+  {"id":20007,"infoId":2,"grid":23,"type":3,"correlationId":10006,"unlock":0},
+  {"id":20008,"infoId":2,"grid":25,"type":3,"correlationId":10007,"unlock":0},
+  {"id":20009,"infoId":2,"grid":26,"type":3,"correlationId":10008,"unlock":0},
+  {"id":20010,"infoId":2,"grid":31,"type":3,"correlationId":10009,"unlock":0},
+  {"id":20011,"infoId":2,"grid":32,"type":3,"correlationId":10010,"unlock":0},
+  {"id":20012,"infoId":2,"grid":34,"type":3,"correlationId":10011,"unlock":0},
+  {"id":20013,"infoId":2,"grid":36,"type":3,"correlationId":10012,"unlock":0},
+  {"id":20014,"infoId":2,"grid":41,"type":3,"correlationId":10013,"unlock":0},
+  {"id":20015,"infoId":2,"grid":42,"type":3,"correlationId":10014,"unlock":0},
+  {"id":20016,"infoId":2,"grid":43,"type":3,"correlationId":10015,"unlock":0},
+  {"id":20017,"infoId":2,"grid":44,"type":3,"correlationId":10016,"unlock":0},
+  {"id":20018,"infoId":2,"grid":46,"type":3,"correlationId":10017,"unlock":0},
+  {"id":20019,"infoId":2,"grid":53,"type":3,"correlationId":10018,"unlock":0}
 ]

assets/json/emitterInfo.json

@@ -1,3 +1,3 @@
 [
-  {"name":"","icon":"","prop":null,"demand":null,"chargingCost":null}
+  {"id":0,"name":"","icon":"","type":0,"upLimit":0,"restoreInterval":0,"restoreNum":0,"prop":null,"demand":null,"chargingType":0,"chargingCost":null,"expiryTime":0}
 ]

assets/json/kaiqiInfo.json

@@ -1,179 +1,3 @@
 [
-  {"id":"100","name":"kaiqi_info_name_100","desc":"kaiqi_info_desc_100","icon":"xiantu_100","needGuide":0,"type1":4,"param1":0,"sevOpenDay":0,"tip":"","record":0},
-  {"id":"150","name":"kaiqi_info_name_150","desc":"kaiqi_info_desc_150","icon":"xiantu_150","needGuide":0,"type1":4,"param1":0,"sevOpenDay":0,"tip":"","record":1},
-  {"id":"151","name":"kaiqi_info_name_151","desc":"kaiqi_info_desc_151","icon":"xiantu_151","needGuide":0,"type1":7,"param1":4,"sevOpenDay":0,"tip":"","record":1},
-  {"id":"152","name":"kaiqi_info_name_152","desc":"kaiqi_info_desc_152","icon":"xiantu_152","needGuide":0,"type1":4,"param1":9999,"sevOpenDay":0,"tip":"","record":1},
-  {"id":"153","name":"kaiqi_info_name_153","desc":"kaiqi_info_desc_153","icon":"xiantu_153","needGuide":0,"type1":4,"param1":0,"sevOpenDay":0,"tip":"","record":1},
-  {"id":"154","name":"kaiqi_info_name_154","desc":"kaiqi_info_desc_154","icon":"xiantu_154","needGuide":0,"type1":4,"param1":21,"sevOpenDay":0,"tip":"","record":1},
-  {"id":"155","name":"kaiqi_info_name_155","desc":"kaiqi_info_desc_155","icon":"xiantu_155","needGuide":0,"type1":4,"param1":9999,"sevOpenDay":0,"tip":"","record":1},
-  {"id":"156","name":"kaiqi_info_name_156","desc":"kaiqi_info_desc_156","icon":"xiantu_156","needGuide":0,"type1":4,"param1":1663,"sevOpenDay":0,"tip":"","record":1},
-  {"id":"157","name":"kaiqi_info_name_157","desc":"kaiqi_info_desc_157","icon":"xiantu_157","needGuide":0,"type1":4,"param1":1663,"sevOpenDay":0,"tip":"","record":1},
-  {"id":"158","name":"kaiqi_info_name_158","desc":"kaiqi_info_desc_158","icon":"xiantu_158","needGuide":1,"type1":4,"param1":889,"sevOpenDay":2,"tip":"","record":1},
-  {"id":"159","name":"kaiqi_info_name_159","desc":"kaiqi_info_desc_159","icon":"xiantu_159","needGuide":0,"type1":4,"param1":9999,"sevOpenDay":0,"tip":"","record":1},
-  {"id":"200","name":"kaiqi_info_name_200","desc":"kaiqi_info_desc_200","icon":"xiantu_200","needGuide":0,"type1":4,"param1":55,"sevOpenDay":0,"tip":"","record":1},
-  {"id":"201","name":"kaiqi_info_name_201","desc":"kaiqi_info_desc_201","icon":"xiantu_10210","needGuide":1,"type1":4,"param1":54,"sevOpenDay":0,"tip":"","record":1},
-  {"id":"202","name":"kaiqi_info_name_202","desc":"kaiqi_info_desc_202","icon":"xiantu_202","needGuide":0,"type1":4,"param1":67,"sevOpenDay":0,"tip":"","record":1},
-  {"id":"203","name":"kaiqi_info_name_203","desc":"kaiqi_info_desc_203","icon":"xiantu_203","needGuide":0,"type1":4,"param1":0,"sevOpenDay":0,"tip":"","record":0},
-  {"id":"204","name":"kaiqi_info_name_204","desc":"kaiqi_info_desc_204","icon":"xiantu_204","needGuide":0,"type1":6,"param1":1,"sevOpenDay":0,"tip":"","record":0},
-  {"id":"205","name":"kaiqi_info_name_205","desc":"kaiqi_info_desc_205","icon":"xiantu_205","needGuide":0,"type1":6,"param1":1,"sevOpenDay":0,"tip":"","record":0},
-  {"id":"206","name":"kaiqi_info_name_206","desc":"kaiqi_info_desc_206","icon":"xiantu_206","needGuide":0,"type1":6,"param1":5,"sevOpenDay":0,"tip":"","record":0},
-  {"id":"207","name":"kaiqi_info_name_207","desc":"kaiqi_info_desc_207","icon":"xiantu_207","needGuide":0,"type1":6,"param1":7,"sevOpenDay":0,"tip":"","record":0},
-  {"id":"208","name":"kaiqi_info_name_208","desc":"kaiqi_info_desc_208","icon":"xiantu_208","needGuide":0,"type1":6,"param1":9,"sevOpenDay":0,"tip":"","record":0},
-  {"id":"250","name":"kaiqi_info_name_250","desc":"kaiqi_info_desc_250","icon":"xiantu_250","needGuide":1,"type1":4,"param1":127,"sevOpenDay":0,"tip":"","record":1},
-  {"id":"300","name":"kaiqi_info_name_300","desc":"kaiqi_info_desc_300","icon":"xiantu_300","needGuide":1,"type1":4,"param1":167,"sevOpenDay":0,"tip":"","record":1},
-  {"id":"301","name":"kaiqi_info_name_301","desc":"kaiqi_info_desc_301","icon":"xiantu_301","needGuide":0,"type1":4,"param1":167,"sevOpenDay":0,"tip":"","record":0},
-  {"id":"302","name":"kaiqi_info_name_302","desc":"kaiqi_info_desc_302","icon":"xiantu_302","needGuide":0,"type1":4,"param1":167,"sevOpenDay":0,"tip":"","record":0},
-  {"id":"303","name":"kaiqi_info_name_303","desc":"kaiqi_info_desc_303","icon":"xiantu_303","needGuide":0,"type1":4,"param1":167,"sevOpenDay":0,"tip":"","record":0},
-  {"id":"304","name":"kaiqi_info_name_304","desc":"kaiqi_info_desc_304","icon":"xiantu_304","needGuide":0,"type1":4,"param1":167,"sevOpenDay":0,"tip":"","record":0},
-  {"id":"305","name":"kaiqi_info_name_305","desc":"kaiqi_info_desc_305","icon":"xiantu_305","needGuide":0,"type1":4,"param1":167,"sevOpenDay":0,"tip":"","record":1},
-  {"id":"306","name":"kaiqi_info_name_306","desc":"kaiqi_info_desc_306","icon":"xiantu_306","needGuide":0,"type1":4,"param1":167,"sevOpenDay":0,"tip":"","record":1},
-  {"id":"307","name":"kaiqi_info_name_307","desc":"kaiqi_info_desc_307","icon":"xiantu_307","needGuide":0,"type1":6,"param1":11,"sevOpenDay":0,"tip":"","record":0},
-  {"id":"308","name":"kaiqi_info_name_308","desc":"kaiqi_info_desc_308","icon":"xiantu_308","needGuide":0,"type1":6,"param1":13,"sevOpenDay":0,"tip":"","record":0},
-  {"id":"350","name":"kaiqi_info_name_350","desc":"kaiqi_info_desc_350","icon":"xiantu_350","needGuide":1,"type1":4,"param1":547,"sevOpenDay":0,"tip":"","record":1},
-  {"id":"400","name":"kaiqi_info_name_400","desc":"kaiqi_info_desc_400","icon":"xiantu_400","needGuide":1,"type1":4,"param1":1119,"sevOpenDay":0,"tip":"","record":1},
-  {"id":"401","name":"kaiqi_info_name_401","desc":"kaiqi_info_desc_401","icon":"xiantu_401","needGuide":1,"type1":4,"param1":1505,"sevOpenDay":5,"tip":"","record":1},
-  {"id":"402","name":"kaiqi_info_name_402","desc":"kaiqi_info_desc_402","icon":"xiantu_402","needGuide":0,"type1":6,"param1":11,"sevOpenDay":0,"tip":"","record":1},
-  {"id":"403","name":"kaiqi_info_name_403","desc":"kaiqi_info_desc_403","icon":"xiantu_403","needGuide":0,"type1":4,"param1":1505,"sevOpenDay":5,"tip":"","record":1},
-  {"id":"450","name":"kaiqi_info_name_450","desc":"kaiqi_info_desc_450","icon":"xiantu_450","needGuide":1,"type1":4,"param1":731,"sevOpenDay":0,"tip":"","record":1},
-  {"id":"500","name":"kaiqi_info_name_500","desc":"kaiqi_info_desc_500","icon":"xiantu_500","needGuide":1,"type1":4,"param1":331,"sevOpenDay":0,"tip":"","record":1},
-  {"id":"501","name":"kaiqi_info_name_501","desc":"kaiqi_info_desc_501","icon":"xiantu_501","needGuide":0,"type1":4,"param1":331,"sevOpenDay":0,"tip":"","record":1},
-  {"id":"502","name":"kaiqi_info_name_502","desc":"kaiqi_info_desc_502","icon":"xiantu_502","needGuide":0,"type1":4,"param1":331,"sevOpenDay":0,"tip":"","record":1},
-  {"id":"503","name":"kaiqi_info_name_503","desc":"kaiqi_info_desc_503","icon":"xiantu_503","needGuide":0,"type1":4,"param1":331,"sevOpenDay":0,"tip":"","record":1},
-  {"id":"504","name":"kaiqi_info_name_504","desc":"kaiqi_info_desc_504","icon":"xiantu_504","needGuide":0,"type1":4,"param1":331,"sevOpenDay":0,"tip":"","record":1},
-  {"id":"550","name":"kaiqi_info_name_550","desc":"kaiqi_info_desc_550","icon":"xiantu_550","needGuide":1,"type1":4,"param1":235,"sevOpenDay":0,"tip":"","record":1},
-  {"id":"551","name":"kaiqi_info_name_551","desc":"kaiqi_info_desc_551","icon":"xiantu_551","needGuide":0,"type1":4,"param1":235,"sevOpenDay":0,"tip":"","record":1},
-  {"id":"552","name":"kaiqi_info_name_552","desc":"kaiqi_info_desc_552","icon":"xiantu_552","needGuide":0,"type1":4,"param1":235,"sevOpenDay":0,"tip":"","record":1},
-  {"id":"553","name":"kaiqi_info_name_553","desc":"kaiqi_info_desc_553","icon":"xiantu_553","needGuide":0,"type1":4,"param1":235,"sevOpenDay":0,"tip":"","record":1},
-  {"id":"554","name":"kaiqi_info_name_554","desc":"kaiqi_info_desc_554","icon":"xiantu_554","needGuide":0,"type1":4,"param1":235,"sevOpenDay":0,"tip":"","record":0},
-  {"id":"555","name":"kaiqi_info_name_555","desc":"kaiqi_info_desc_555","icon":"xiantu_555","needGuide":0,"type1":4,"param1":235,"sevOpenDay":0,"tip":"","record":0},
-  {"id":"556","name":"kaiqi_info_name_556","desc":"kaiqi_info_desc_556","icon":"xiantu_556","needGuide":0,"type1":4,"param1":235,"sevOpenDay":0,"tip":"","record":1},
-  {"id":"557","name":"kaiqi_info_name_557","desc":"kaiqi_info_desc_557","icon":"xiantu_557","needGuide":0,"type1":4,"param1":235,"sevOpenDay":0,"tip":"","record":1},
-  {"id":"558","name":"kaiqi_info_name_558","desc":"kaiqi_info_desc_558","icon":"xiantu_558","needGuide":0,"type1":4,"param1":9999,"sevOpenDay":0,"tip":"","record":1},
-  {"id":"559","name":"kaiqi_info_name_559","desc":"kaiqi_info_desc_559","icon":"xiantu_559","needGuide":0,"type1":4,"param1":235,"sevOpenDay":2,"tip":"","record":1},
-  {"id":"560","name":"kaiqi_info_name_560","desc":"kaiqi_info_desc_560","icon":"xiantu_560","needGuide":0,"type1":4,"param1":9999,"sevOpenDay":0,"tip":"","record":0},
-  {"id":"561","name":"kaiqi_info_name_561","desc":"kaiqi_info_desc_561","icon":"xiantu_561","needGuide":0,"type1":4,"param1":235,"sevOpenDay":0,"tip":"","record":1},
-  {"id":"562","name":"kaiqi_info_name_562","desc":"kaiqi_info_desc_562","icon":"xiantu_562","needGuide":0,"type1":4,"param1":235,"sevOpenDay":2,"tip":"","record":1},
-  {"id":"600","name":"kaiqi_info_name_600","desc":"kaiqi_info_desc_600","icon":"xiantu_600","needGuide":0,"type1":4,"param1":9999,"sevOpenDay":0,"tip":"","record":1},
-  {"id":"650","name":"kaiqi_info_name_650","desc":"kaiqi_info_desc_650","icon":"xiantu_650","needGuide":0,"type1":4,"param1":9999,"sevOpenDay":0,"tip":"","record":0},
-  {"id":"700","name":"kaiqi_info_name_700","desc":"kaiqi_info_desc_700","icon":"xiantu_700","needGuide":0,"type1":4,"param1":71,"sevOpenDay":0,"tip":"","record":1},
-  {"id":"710","name":"kaiqi_info_name_710","desc":"kaiqi_info_desc_710","icon":"xiantu_710","needGuide":0,"type1":4,"param1":62,"sevOpenDay":0,"tip":"","record":1},
-  {"id":"750","name":"kaiqi_info_name_750","desc":"kaiqi_info_desc_750","icon":"xiantu_750","needGuide":1,"type1":4,"param1":1663,"sevOpenDay":7,"tip":"","record":1},
-  {"id":"751","name":"kaiqi_info_name_751","desc":"kaiqi_info_desc_751","icon":"xiantu_751","needGuide":0,"type1":4,"param1":1663,"sevOpenDay":7,"tip":"","record":1},
-  {"id":"760","name":"kaiqi_info_name_760","desc":"kaiqi_info_desc_760","icon":"xiantu_760","needGuide":1,"type1":4,"param1":1505,"sevOpenDay":4,"tip":"","record":1},
-  {"id":"761","name":"kaiqi_info_name_761","desc":"kaiqi_info_desc_761","icon":"xiantu_761","needGuide":0,"type1":4,"param1":1505,"sevOpenDay":4,"tip":"","record":1},
-  {"id":"762","name":"kaiqi_info_name_762","desc":"kaiqi_info_desc_762","icon":"xiantu_762","needGuide":0,"type1":4,"param1":1505,"sevOpenDay":4,"tip":"","record":1},
-  {"id":"763","name":"kaiqi_info_name_763","desc":"kaiqi_info_desc_763","icon":"xiantu_763","needGuide":0,"type1":4,"param1":1505,"sevOpenDay":4,"tip":"","record":1},
-  {"id":"764","name":"kaiqi_info_name_764","desc":"kaiqi_info_desc_764","icon":"xiantu_764","needGuide":0,"type1":6,"param1":11,"sevOpenDay":0,"tip":"","record":0},
-  {"id":"765","name":"kaiqi_info_name_765","desc":"kaiqi_info_desc_765","icon":"xiantu_765","needGuide":0,"type1":6,"param1":13,"sevOpenDay":0,"tip":"","record":0},
-  {"id":"800","name":"kaiqi_info_name_800","desc":"kaiqi_info_desc_800","icon":"xiantu_800","needGuide":1,"type1":4,"param1":639,"sevOpenDay":0,"tip":"","record":1},
-  {"id":"801","name":"kaiqi_info_name_801","desc":"kaiqi_info_desc_801","icon":"xiantu_801","needGuide":0,"type1":4,"param1":639,"sevOpenDay":0,"tip":"","record":1},
-  {"id":"900","name":"kaiqi_info_name_900","desc":"kaiqi_info_desc_900","icon":"xiantu_900","needGuide":1,"type1":4,"param1":812,"sevOpenDay":2,"tip":"","record":1},
-  {"id":"950","name":"kaiqi_info_name_950","desc":"kaiqi_info_desc_950","icon":"xiantu_950","needGuide":0,"type1":4,"param1":427,"sevOpenDay":5,"tip":"","record":1},
-  {"id":"960","name":"kaiqi_info_name_960","desc":"kaiqi_info_desc_960","icon":"xiantu_960","needGuide":0,"type1":4,"param1":45,"sevOpenDay":0,"tip":"","record":1},
-  {"id":"1000","name":"kaiqi_info_name_1000","desc":"kaiqi_info_desc_1000","icon":"xiantu_1000","needGuide":0,"type1":4,"param1":0,"sevOpenDay":0,"tip":"","record":1},
-  {"id":"1010","name":"kaiqi_info_name_1010","desc":"kaiqi_info_desc_1010","icon":"xiantu_1010","needGuide":1,"type1":4,"param1":62,"sevOpenDay":0,"tip":"","record":1},
-  {"id":"1020","name":"kaiqi_info_name_1020","desc":"kaiqi_info_desc_1020","icon":"xiantu_1020","needGuide":0,"type1":4,"param1":88,"sevOpenDay":0,"tip":"","record":1},
-  {"id":"1030","name":"kaiqi_info_name_1030","desc":"kaiqi_info_desc_1030","icon":"xiantu_1030","needGuide":0,"type1":4,"param1":204,"sevOpenDay":0,"tip":"","record":1},
-  {"id":"1040","name":"kaiqi_info_name_1040","desc":"kaiqi_info_desc_1040","icon":"xiantu_1040","needGuide":0,"type1":4,"param1":9999,"sevOpenDay":0,"tip":"","record":1},
-  {"id":"1050","name":"kaiqi_info_name_1050","desc":"kaiqi_info_desc_1050","icon":"xiantu_1050","needGuide":1,"type1":4,"param1":126,"sevOpenDay":0,"tip":"","record":1},
-  {"id":"1060","name":"kaiqi_info_name_1060","desc":"kaiqi_info_desc_1060","icon":"xiantu_1060","needGuide":1,"type1":4,"param1":551,"sevOpenDay":0,"tip":"","record":1},
-  {"id":"1070","name":"kaiqi_info_name_1070","desc":"kaiqi_info_desc_1070","icon":"xiantu_1070","needGuide":0,"type1":4,"param1":9999,"sevOpenDay":0,"tip":"","record":1},
-  {"id":"1080","name":"kaiqi_info_name_1080","desc":"kaiqi_info_desc_1080","icon":"xiantu_1080","needGuide":1,"type1":4,"param1":1129,"sevOpenDay":0,"tip":"","record":1},
-  {"id":"1090","name":"kaiqi_info_name_1090","desc":"kaiqi_info_desc_1090","icon":"xiantu_1090","needGuide":0,"type1":4,"param1":9999,"sevOpenDay":0,"tip":"","record":1},
-  {"id":"1100","name":"kaiqi_info_name_1100","desc":"kaiqi_info_desc_1100","icon":"xiantu_1100","needGuide":1,"type1":4,"param1":1307,"sevOpenDay":3,"tip":"","record":1},
-  {"id":"1101","name":"kaiqi_info_name_1101","desc":"kaiqi_info_desc_1101","icon":"xiantu_1101","needGuide":0,"type1":4,"param1":1307,"sevOpenDay":3,"tip":"","record":1},
-  {"id":"1110","name":"kaiqi_info_name_1110","desc":"kaiqi_info_desc_1110","icon":"xiantu_1110","needGuide":0,"type1":4,"param1":45,"sevOpenDay":0,"tip":"","record":1},
-  {"id":"1120","name":"kaiqi_info_name_1120","desc":"kaiqi_info_desc_1120","icon":"xiantu_1120","needGuide":0,"type1":4,"param1":1505,"sevOpenDay":5,"tip":"","record":1},
-  {"id":"1130","name":"kaiqi_info_name_1130","desc":"kaiqi_info_desc_1130","icon":"xiantu_1130","needGuide":0,"type1":4,"param1":45,"sevOpenDay":0,"tip":"","record":1},
-  {"id":"1140","name":"kaiqi_info_name_1140","desc":"kaiqi_info_desc_1140","icon":"xiantu_1140","needGuide":0,"type1":4,"param1":9999,"sevOpenDay":0,"tip":"","record":0},
-  {"id":"1150","name":"kaiqi_info_name_1150","desc":"kaiqi_info_desc_1150","icon":"xiantu_1150","needGuide":0,"type1":4,"param1":9999,"sevOpenDay":0,"tip":"","record":0},
-  {"id":"1160","name":"kaiqi_info_name_1160","desc":"kaiqi_info_desc_1160","icon":"xiantu_1160","needGuide":0,"type1":4,"param1":9999,"sevOpenDay":0,"tip":"","record":1},
-  {"id":"1170","name":"kaiqi_info_name_1170","desc":"kaiqi_info_desc_1170","icon":"xiantu_1170","needGuide":0,"type1":4,"param1":1660,"sevOpenDay":0,"tip":"","record":1},
-  {"id":"1180","name":"kaiqi_info_name_1180","desc":"kaiqi_info_desc_1180","icon":"xiantu_1180","needGuide":1,"type1":4,"param1":430,"sevOpenDay":0,"tip":"","record":1},
-  {"id":"1190","name":"kaiqi_info_name_1190","desc":"kaiqi_info_desc_1190","icon":"xiantu_1190","needGuide":0,"type1":4,"param1":680,"sevOpenDay":0,"tip":"","record":1},
-  {"id":"1200","name":"kaiqi_info_name_1200","desc":"kaiqi_info_desc_1200","icon":"xiantu_1200","needGuide":0,"type1":4,"param1":889,"sevOpenDay":0,"tip":"","record":1},
-  {"id":"1201","name":"kaiqi_info_name_1201","desc":"kaiqi_info_desc_1201","icon":"xiantu_1201","needGuide":0,"type1":4,"param1":430,"sevOpenDay":0,"tip":"","record":1},
-  {"id":"3000","name":"kaiqi_info_name_3000","desc":"kaiqi_info_desc_3000","icon":"xiantu_3000","needGuide":0,"type1":4,"param1":62,"sevOpenDay":0,"tip":"","record":1},
-  {"id":"3010","name":"kaiqi_info_name_3010","desc":"kaiqi_info_desc_3010","icon":"xiantu_3010","needGuide":0,"type1":4,"param1":62,"sevOpenDay":0,"tip":"","record":1},
-  {"id":"3020","name":"kaiqi_info_name_3020","desc":"kaiqi_info_desc_3020","icon":"xiantu_3020","needGuide":0,"type1":4,"param1":167,"sevOpenDay":0,"tip":"","record":1},
-  {"id":"3030","name":"kaiqi_info_name_3030","desc":"kaiqi_info_desc_3030","icon":"xiantu_3030","needGuide":0,"type1":4,"param1":551,"sevOpenDay":0,"tip":"","record":1},
-  {"id":"3040","name":"kaiqi_info_name_3040","desc":"kaiqi_info_desc_3040","icon":"xiantu_3040","needGuide":0,"type1":4,"param1":1505,"sevOpenDay":5,"tip":"","record":1},
-  {"id":"3270","name":"kaiqi_info_name_3270","desc":"kaiqi_info_desc_3270","icon":"xiantu_3270","needGuide":0,"type1":4,"param1":331,"sevOpenDay":0,"tip":"","record":1},
-  {"id":"3280","name":"kaiqi_info_name_3280","desc":"kaiqi_info_desc_3280","icon":"xiantu_3280","needGuide":0,"type1":4,"param1":62,"sevOpenDay":0,"tip":"","record":1},
-  {"id":"3281","name":"kaiqi_info_name_3281","desc":"kaiqi_info_desc_3281","icon":"xiantu_3281","needGuide":0,"type1":4,"param1":812,"sevOpenDay":0,"tip":"","record":1},
-  {"id":"3050","name":"kaiqi_info_name_3050","desc":"kaiqi_info_desc_3050","icon":"xiantu_3050","needGuide":0,"type1":4,"param1":62,"sevOpenDay":0,"tip":"","record":1},
-  {"id":"3060","name":"kaiqi_info_name_3060","desc":"kaiqi_info_desc_3060","icon":"xiantu_3060","needGuide":0,"type1":4,"param1":62,"sevOpenDay":0,"tip":"","record":1},
-  {"id":"3070","name":"kaiqi_info_name_3070","desc":"kaiqi_info_desc_3070","icon":"xiantu_3070","needGuide":0,"type1":4,"param1":62,"sevOpenDay":0,"tip":"","record":1},
-  {"id":"3080","name":"kaiqi_info_name_3080","desc":"kaiqi_info_desc_3080","icon":"xiantu_3080","needGuide":0,"type1":4,"param1":62,"sevOpenDay":0,"tip":"","record":1},
-  {"id":"3090","name":"kaiqi_info_name_3090","desc":"kaiqi_info_desc_3090","icon":"xiantu_3090","needGuide":0,"type1":4,"param1":62,"sevOpenDay":0,"tip":"","record":1},
-  {"id":"3100","name":"kaiqi_info_name_3100","desc":"kaiqi_info_desc_3100","icon":"xiantu_3100","needGuide":0,"type1":4,"param1":55,"sevOpenDay":0,"tip":"","record":1},
-  {"id":"3101","name":"kaiqi_info_name_3101","desc":"kaiqi_info_desc_3101","icon":"xiantu_3101","needGuide":0,"type1":4,"param1":55,"sevOpenDay":0,"tip":"","record":1},
-  {"id":"3110","name":"kaiqi_info_name_3110","desc":"kaiqi_info_desc_3110","icon":"xiantu_3110","needGuide":0,"type1":4,"param1":9999,"sevOpenDay":0,"tip":"","record":1},
-  {"id":"3120","name":"kaiqi_info_name_3120","desc":"kaiqi_info_desc_3120","icon":"xiantu_3120","needGuide":0,"type1":4,"param1":45,"sevOpenDay":0,"tip":"","record":1},
-  {"id":"3130","name":"kaiqi_info_name_3130","desc":"kaiqi_info_desc_3130","icon":"xiantu_3130","needGuide":0,"type1":4,"param1":45,"sevOpenDay":0,"tip":"","record":1},
-  {"id":"3140","name":"kaiqi_info_name_3140","desc":"kaiqi_info_desc_3140","icon":"xiantu_3140","needGuide":0,"type1":4,"param1":45,"sevOpenDay":0,"tip":"","record":1},
-  {"id":"3150","name":"kaiqi_info_name_3150","desc":"kaiqi_info_desc_3150","icon":"xiantu_3150","needGuide":0,"type1":4,"param1":45,"sevOpenDay":0,"tip":"","record":1},
-  {"id":"3160","name":"kaiqi_info_name_3160","desc":"kaiqi_info_desc_3160","icon":"xiantu_3160","needGuide":0,"type1":4,"param1":45,"sevOpenDay":0,"tip":"","record":1},
-  {"id":"3170","name":"kaiqi_info_name_3170","desc":"kaiqi_info_desc_3170","icon":"xiantu_3170","needGuide":0,"type1":4,"param1":9999,"sevOpenDay":0,"tip":"","record":1},
-  {"id":"3180","name":"kaiqi_info_name_3180","desc":"kaiqi_info_desc_3180","icon":"xiantu_3180","needGuide":0,"type1":4,"param1":9999,"sevOpenDay":0,"tip":"","record":1},
-  {"id":"3190","name":"kaiqi_info_name_3190","desc":"kaiqi_info_desc_3190","icon":"xiantu_3190","needGuide":0,"type1":4,"param1":62,"sevOpenDay":0,"tip":"","record":0},
-  {"id":"3191","name":"kaiqi_info_name_3191","desc":"kaiqi_info_desc_3191","icon":"xiantu_3191","needGuide":0,"type1":4,"param1":9999,"sevOpenDay":0,"tip":"","record":0},
-  {"id":"3200","name":"kaiqi_info_name_3200","desc":"kaiqi_info_desc_3200","icon":"xiantu_3200","needGuide":0,"type1":4,"param1":9999,"sevOpenDay":0,"tip":"","record":0},
-  {"id":"3210","name":"kaiqi_info_name_3210","desc":"kaiqi_info_desc_3210","icon":"xiantu_3210","needGuide":0,"type1":4,"param1":62,"sevOpenDay":0,"tip":"","record":1},
-  {"id":"3220","name":"kaiqi_info_name_3220","desc":"kaiqi_info_desc_3220","icon":"xiantu_3220","needGuide":0,"type1":4,"param1":62,"sevOpenDay":0,"tip":"","record":1},
-  {"id":"3230","name":"kaiqi_info_name_3230","desc":"kaiqi_info_desc_3230","icon":"xiantu_3230","needGuide":0,"type1":4,"param1":62,"sevOpenDay":0,"tip":"","record":1},
-  {"id":"3240","name":"kaiqi_info_name_3240","desc":"kaiqi_info_desc_3240","icon":"xiantu_3240","needGuide":0,"type1":4,"param1":62,"sevOpenDay":0,"tip":"","record":1},
-  {"id":"3260","name":"kaiqi_info_name_3260","desc":"kaiqi_info_desc_3260","icon":"xiantu_3260","needGuide":0,"type1":4,"param1":45,"sevOpenDay":0,"tip":"","record":1},
-  {"id":"3290","name":"kaiqi_info_name_3290","desc":"kaiqi_info_desc_3290","icon":"xiantu_3290","needGuide":0,"type1":4,"param1":45,"sevOpenDay":0,"tip":"","record":1},
-  {"id":"3291","name":"kaiqi_info_name_3291","desc":"kaiqi_info_desc_3291","icon":"xiantu_3291","needGuide":0,"type1":4,"param1":45,"sevOpenDay":0,"tip":"","record":1},
-  {"id":"3300","name":"kaiqi_info_name_3300","desc":"kaiqi_info_desc_3300","icon":"xiantu_3300","needGuide":0,"type1":4,"param1":1,"sevOpenDay":0,"tip":"","record":1},
-  {"id":"3310","name":"kaiqi_info_name_3310","desc":"kaiqi_info_desc_3310","icon":"xiantu_3310","needGuide":0,"type1":4,"param1":45,"sevOpenDay":0,"tip":"","record":1},
-  {"id":"3320","name":"kaiqi_info_name_3320","desc":"kaiqi_info_desc_3320","icon":"xiantu_3320","needGuide":0,"type1":4,"param1":126,"sevOpenDay":0,"tip":"","record":1},
-  {"id":"3330","name":"kaiqi_info_name_3330","desc":"kaiqi_info_desc_3330","icon":"xiantu_3330","needGuide":0,"type1":4,"param1":0,"sevOpenDay":0,"tip":"","record":1},
-  {"id":"3340","name":"kaiqi_info_name_3340","desc":"kaiqi_info_desc_3340","icon":"xiantu_3340","needGuide":0,"type1":4,"param1":0,"sevOpenDay":0,"tip":"","record":1},
-  {"id":"3350","name":"kaiqi_info_name_3350","desc":"kaiqi_info_desc_3350","icon":"xiantu_3350","needGuide":0,"type1":4,"param1":0,"sevOpenDay":0,"tip":"","record":1},
-  {"id":"3360","name":"kaiqi_info_name_3360","desc":"kaiqi_info_desc_3360","icon":"xiantu_3360","needGuide":0,"type1":4,"param1":45,"sevOpenDay":0,"tip":"","record":1},
-  {"id":"3361","name":"kaiqi_info_name_3361","desc":"kaiqi_info_desc_3361","icon":"xiantu_3361","needGuide":0,"type1":4,"param1":45,"sevOpenDay":0,"tip":"","record":1},
-  {"id":"3370","name":"kaiqi_info_name_3370","desc":"kaiqi_info_desc_3370","icon":"xiantu_3370","needGuide":0,"type1":4,"param1":45,"sevOpenDay":0,"tip":"","record":1},
-  {"id":"3380","name":"kaiqi_info_name_3380","desc":"kaiqi_info_desc_3380","icon":"xiantu_3380","needGuide":0,"type1":4,"param1":45,"sevOpenDay":0,"tip":"","record":1},
-  {"id":"3390","name":"kaiqi_info_name_3390","desc":"kaiqi_info_desc_3390","icon":"xiantu_3390","needGuide":0,"type1":4,"param1":45,"sevOpenDay":0,"tip":"","record":1},
-  {"id":"3391","name":"kaiqi_info_name_3391","desc":"kaiqi_info_desc_3391","icon":"xiantu_3391","needGuide":0,"type1":4,"param1":45,"sevOpenDay":0,"tip":"","record":1},
-  {"id":"3400","name":"kaiqi_info_name_3400","desc":"kaiqi_info_desc_3400","icon":"xiantu_3400","needGuide":0,"type1":4,"param1":0,"sevOpenDay":0,"tip":"","record":1},
-  {"id":"3410","name":"kaiqi_info_name_3410","desc":"kaiqi_info_desc_3410","icon":"xiantu_3410","needGuide":0,"type1":4,"param1":45,"sevOpenDay":0,"tip":"","record":1},
-  {"id":"3411","name":"kaiqi_info_name_3411","desc":"kaiqi_info_desc_3411","icon":"xiantu_3411","needGuide":0,"type1":4,"param1":45,"sevOpenDay":0,"tip":"","record":1},
-  {"id":"3420","name":"kaiqi_info_name_3420","desc":"kaiqi_info_desc_3420","icon":"xiantu_3420","needGuide":0,"type1":4,"param1":45,"sevOpenDay":0,"tip":"","record":1},
-  {"id":"10000","name":"kaiqi_info_name_10000","desc":"kaiqi_info_desc_10000","icon":"xiantu_10000","needGuide":0,"type1":4,"param1":45,"sevOpenDay":0,"tip":"","record":1},
-  {"id":"10010","name":"kaiqi_info_name_10010","desc":"kaiqi_info_desc_10010","icon":"xiantu_10010","needGuide":0,"type1":4,"param1":0,"sevOpenDay":0,"tip":"","record":0},
-  {"id":"10020","name":"kaiqi_info_name_10020","desc":"kaiqi_info_desc_10020","icon":"xiantu_10020","needGuide":0,"type1":1,"param1":10,"sevOpenDay":0,"tip":"","record":0},
-  {"id":"10021","name":"kaiqi_info_name_10021","desc":"kaiqi_info_desc_10021","icon":"xiantu_10021","needGuide":0,"type1":4,"param1":9999,"sevOpenDay":0,"tip":"","record":0},
-  {"id":"10022","name":"kaiqi_info_name_10022","desc":"kaiqi_info_desc_10022","icon":"xiantu_10022","needGuide":0,"type1":1,"param1":60,"sevOpenDay":0,"tip":"","record":0},
-  {"id":"10030","name":"kaiqi_info_name_10030","desc":"kaiqi_info_desc_10030","icon":"xiantu_10030","needGuide":1,"type1":4,"param1":45,"sevOpenDay":0,"tip":"","record":1},
-  {"id":"10040","name":"kaiqi_info_name_10040","desc":"kaiqi_info_desc_10040","icon":"xiantu_10040","needGuide":0,"type1":4,"param1":0,"sevOpenDay":0,"tip":"","record":0},
-  {"id":"10050","name":"kaiqi_info_name_10050","desc":"kaiqi_info_desc_10050","icon":"xiantu_10050","needGuide":0,"type1":4,"param1":9999,"sevOpenDay":0,"tip":"","record":0},
-  {"id":"10060","name":"kaiqi_info_name_10060","desc":"kaiqi_info_desc_10060","icon":"xiantu_10060","needGuide":0,"type1":4,"param1":0,"sevOpenDay":0,"tip":"","record":1},
-  {"id":"10070","name":"kaiqi_info_name_10070","desc":"kaiqi_info_desc_10070","icon":"xiantu_10070","needGuide":0,"type1":4,"param1":0,"sevOpenDay":0,"tip":"","record":0},
-  {"id":"10080","name":"kaiqi_info_name_10080","desc":"kaiqi_info_desc_10080","icon":"xiantu_10080","needGuide":0,"type1":4,"param1":0,"sevOpenDay":0,"tip":"","record":1},
-  {"id":"10081","name":"kaiqi_info_name_10081","desc":"kaiqi_info_desc_10081","icon":"xiantu_10081","needGuide":0,"type1":4,"param1":0,"sevOpenDay":0,"tip":"","record":1},
-  {"id":"10082","name":"kaiqi_info_name_10082","desc":"kaiqi_info_desc_10082","icon":"xiantu_10082","needGuide":0,"type1":4,"param1":0,"sevOpenDay":0,"tip":"","record":1},
-  {"id":"10083","name":"kaiqi_info_name_10083","desc":"kaiqi_info_desc_10083","icon":"xiantu_10083","needGuide":0,"type1":4,"param1":0,"sevOpenDay":0,"tip":"","record":1},
-  {"id":"10090","name":"kaiqi_info_name_10090","desc":"kaiqi_info_desc_10090","icon":"xiantu_10090","needGuide":0,"type1":4,"param1":0,"sevOpenDay":0,"tip":"","record":1},
-  {"id":"10100","name":"kaiqi_info_name_10100","desc":"kaiqi_info_desc_10100","icon":"xiantu_10100","needGuide":0,"type1":4,"param1":0,"sevOpenDay":0,"tip":"","record":1},
-  {"id":"10101","name":"kaiqi_info_name_10101","desc":"kaiqi_info_desc_10101","icon":"xiantu_10101","needGuide":0,"type1":4,"param1":0,"sevOpenDay":0,"tip":"","record":1},
-  {"id":"10110","name":"kaiqi_info_name_10110","desc":"kaiqi_info_desc_10110","icon":"xiantu_10110","needGuide":0,"type1":4,"param1":0,"sevOpenDay":0,"tip":"","record":0},
-  {"id":"10120","name":"kaiqi_info_name_10120","desc":"kaiqi_info_desc_10120","icon":"xiantu_10120","needGuide":0,"type1":4,"param1":9999,"sevOpenDay":0,"tip":"","record":0},
-  {"id":"10130","name":"kaiqi_info_name_10130","desc":"kaiqi_info_desc_10130","icon":"xiantu_10130","needGuide":0,"type1":4,"param1":9999,"sevOpenDay":0,"tip":"","record":0},
-  {"id":"10140","name":"kaiqi_info_name_10140","desc":"kaiqi_info_desc_10140","icon":"xiantu_10140","needGuide":0,"type1":4,"param1":47,"sevOpenDay":0,"tip":"","record":0},
-  {"id":"10160","name":"kaiqi_info_name_10160","desc":"kaiqi_info_desc_10160","icon":"xiantu_10160","needGuide":0,"type1":4,"param1":9999,"sevOpenDay":0,"tip":"","record":0},
-  {"id":"10170","name":"kaiqi_info_name_10170","desc":"kaiqi_info_desc_10170","icon":"xiantu_10170","needGuide":0,"type1":4,"param1":0,"sevOpenDay":0,"tip":"","record":0},
-  {"id":"10180","name":"kaiqi_info_name_10180","desc":"kaiqi_info_desc_10180","icon":"xiantu_10180","needGuide":0,"type1":4,"param1":55,"sevOpenDay":0,"tip":"","record":0},
-  {"id":"10190","name":"kaiqi_info_name_10190","desc":"kaiqi_info_desc_10190","icon":"xiantu_10190","needGuide":0,"type1":4,"param1":62,"sevOpenDay":0,"tip":"","record":0},
-  {"id":"10200","name":"kaiqi_info_name_10200","desc":"kaiqi_info_desc_10200","icon":"xiantu_10200","needGuide":0,"type1":4,"param1":126,"sevOpenDay":0,"tip":"","record":0},
-  {"id":"10210","name":"kaiqi_info_name_10210","desc":"kaiqi_info_desc_10210","icon":"xiantu_10210","needGuide":0,"type1":4,"param1":54,"sevOpenDay":0,"tip":"","record":0},
-  {"id":"10220","name":"kaiqi_info_name_10220","desc":"kaiqi_info_desc_10220","icon":"xiantu_10220","needGuide":0,"type1":4,"param1":551,"sevOpenDay":0,"tip":"","record":0},
-  {"id":"10225","name":"kaiqi_info_name_10225","desc":"kaiqi_info_desc_10225","icon":"xiantu_10225","needGuide":0,"type1":4,"param1":430,"sevOpenDay":0,"tip":"","record":0},
-  {"id":"10230","name":"kaiqi_info_name_10230","desc":"kaiqi_info_desc_10230","icon":"xiantu_10230","needGuide":0,"type1":4,"param1":62,"sevOpenDay":0,"tip":"","record":0},
-  {"id":"10240","name":"kaiqi_info_name_10240","desc":"kaiqi_info_desc_10240","icon":"xiantu_10240","needGuide":0,"type1":4,"param1":171,"sevOpenDay":0,"tip":"","record":1},
-  {"id":"10250","name":"kaiqi_info_name_10250","desc":"kaiqi_info_desc_10250","icon":"xiantu_10250","needGuide":0,"type1":4,"param1":550,"sevOpenDay":0,"tip":"","record":1},
-  {"id":"10260","name":"kaiqi_info_name_10260","desc":"kaiqi_info_desc_10260","icon":"xiantu_10260","needGuide":1,"type1":4,"param1":71,"sevOpenDay":0,"tip":"","record":1},
-  {"id":"10270","name":"kaiqi_info_name_10270","desc":"kaiqi_info_desc_10270","icon":"xiantu_10270","needGuide":0,"type1":4,"param1":9999,"sevOpenDay":0,"tip":"","record":0}
+  {"id":"","name":"","desc":"","icon":"","needGuide":0,"type1":0,"param1":0,"sevOpenDay":0,"tip":"","record":0}
 ]

assets/script/common/gameCfg.ts

@@ -1,31 +1,36 @@
 import ConfProxy, { ConfListProxy } from "./confProxy"
-import { XlsConfig, xlsItemKind, xlsItemMoney, xlsMathInfo, xlsPackageInfo, xlsLanguageLang, xlsLanguageClientText, xlsLanguageSeverHouduan
-, xlsAudioInfo, xlsGuideInfo, xlsChapterInfo, xlsChapterLayout, xlsEmitterInfo, xlsMergePropInfo } from "./xlsConfig"
+import { XlsConfig, xlsAttrAttr, xlsAudioInfo, xlsChapterInfo, xlsChapterLayout, xlsEmitterInfo, xlsGuideInfo, xlsItemKind
+, xlsItemMoney, xlsKaiqiInfo, xlsLanguageLang, xlsLanguageClientText, xlsLanguageSeverHouduan, xlsMathInfo, xlsMergePropInfo, xlsNameName, xlsPackageInfo
+, xlsPingbiciInfo } from "./xlsConfig"
 
 export default class Gamecfg {
+    static attrAttr:ConfProxy<xlsAttrAttr>
+    static audioInfo:ConfProxy<xlsAudioInfo>
+    static chapterInfo:ConfProxy<xlsChapterInfo>
+    static chapterLayoutList:ConfListProxy<xlsChapterLayout>
+    static emitterInfo:ConfProxy<xlsEmitterInfo>
+    static guideInfo:ConfProxy<xlsGuideInfo>
+    static guideInfoList:ConfListProxy<xlsGuideInfo>
     static itemKind:ConfProxy<xlsItemKind>
     static itemMoney:ConfProxy<xlsItemMoney>
-    static mathInfo:ConfProxy<xlsMathInfo>
-    static packageInfo:ConfProxy<xlsPackageInfo>
+    static kaiqiInfo:ConfProxy<xlsKaiqiInfo>
     static languageLang:ConfProxy<xlsLanguageLang>
     static languageClientText:ConfProxy<xlsLanguageClientText>
     static languageSeverHouduan:ConfProxy<xlsLanguageSeverHouduan>
-    static audioInfo:ConfProxy<xlsAudioInfo>
-    static guideInfo:ConfProxy<xlsGuideInfo>
-    static guideInfoList:ConfListProxy<xlsGuideInfo>
-    static chapterInfo:ConfProxy<xlsChapterInfo>
-    static chapterLayoutList:ConfListProxy<xlsChapterLayout>
-    static emitterInfo:ConfProxy<xlsEmitterInfo>
+    static mathInfo:ConfProxy<xlsMathInfo>
     static mergePropInfo:ConfProxy<xlsMergePropInfo>
+    static nameName:ConfProxy<xlsNameName>
+    static packageInfo:ConfProxy<xlsPackageInfo>
+    static pingbiciInfo:ConfProxy<xlsPingbiciInfo>
 
     static initLoading(loadSuccess: Function) {
        try {
            new XlsConfig("loadJson",(xls: XlsConfig) => {
-               Gamecfg.mathInfo = new ConfProxy("mathInfo",xls.xlsMathInfo ,"key")
-               Gamecfg.packageInfo = new ConfProxy("packageInfo",xls.xlsPackageInfo ,"id")
+               Gamecfg.audioInfo = new ConfProxy("audioInfo",xls.xlsAudioInfo ,"id")
                Gamecfg.languageLang = new ConfProxy("languageLang",xls.xlsLanguageLang ,"key")
                Gamecfg.languageClientText = new ConfProxy("languageClientText",xls.xlsLanguageClientText ,"key")
-               Gamecfg.audioInfo = new ConfProxy("audioInfo",xls.xlsAudioInfo ,"id")
+               Gamecfg.mathInfo = new ConfProxy("mathInfo",xls.xlsMathInfo ,"key")
+               Gamecfg.packageInfo = new ConfProxy("packageInfo",xls.xlsPackageInfo ,"id")
 
 				loadSuccess(true)
 			})
@@ -36,15 +41,19 @@ export default class Gamecfg {
     static init(loadSuccess: Function, progressCallback: Function) {
        try {
            new XlsConfig("pzwj",(xls: XlsConfig) => {
-               Gamecfg.itemKind = new ConfProxy("itemKind",xls.xlsItemKind ,"kind")
-               Gamecfg.itemMoney = new ConfProxy("itemMoney",xls.xlsItemMoney ,"id")
-               Gamecfg.languageSeverHouduan = new ConfProxy("languageSeverHouduan",xls.xlsLanguageSeverHouduan ,"key")
-               Gamecfg.guideInfo = new ConfProxy("guideInfo",xls.xlsGuideInfo ,"id")
-               Gamecfg.guideInfoList = new ConfListProxy("guideInfoList",xls.xlsGuideInfo ,"event")
+               Gamecfg.attrAttr = new ConfProxy("attrAttr",xls.xlsAttrAttr ,"id")
                Gamecfg.chapterInfo = new ConfProxy("chapterInfo",xls.xlsChapterInfo ,"id")
                Gamecfg.chapterLayoutList = new ConfListProxy("chapterLayoutList",xls.xlsChapterLayout ,"infoId")
                Gamecfg.emitterInfo = new ConfProxy("emitterInfo",xls.xlsEmitterInfo ,"id")
+               Gamecfg.guideInfo = new ConfProxy("guideInfo",xls.xlsGuideInfo ,"id")
+               Gamecfg.guideInfoList = new ConfListProxy("guideInfoList",xls.xlsGuideInfo ,"event")
+               Gamecfg.itemKind = new ConfProxy("itemKind",xls.xlsItemKind ,"kind")
+               Gamecfg.itemMoney = new ConfProxy("itemMoney",xls.xlsItemMoney ,"id")
+               Gamecfg.kaiqiInfo = new ConfProxy("kaiqiInfo",xls.xlsKaiqiInfo ,"id")
+               Gamecfg.languageSeverHouduan = new ConfProxy("languageSeverHouduan",xls.xlsLanguageSeverHouduan ,"key")
                Gamecfg.mergePropInfo = new ConfProxy("mergePropInfo",xls.xlsMergePropInfo ,"id")
+               Gamecfg.nameName = new ConfProxy("nameName",xls.xlsNameName ,"frist")
+               Gamecfg.pingbiciInfo = new ConfProxy("pingbiciInfo",xls.xlsPingbiciInfo ,"id")
 
                 loadSuccess(true)
             }, progressCallback)

assets/script/common/xlsConfig.ts

@@ -1,13 +1,14 @@
 import GameController from "../GameController"
 import { gameMethod } from "./gameMethod"
 // type for attr.excel
+export type xlsAttrAttr = {id:number,name:string,showName:string,attrDesc:string,numType:number,upper:number,icon:string,powerConversion:number,#:备注}
 // type for audio.excel
 export type xlsAudioInfo = {id:string,name:string,vol:number}
 // type for chapter.excel
-export type xlsChapterInfo = {id:int,grid:int[],map:string,name:string}
-export type xlsChapterLayout = {id:int,infoId:int,grid:int,type:int,correlationId:int,unlock:int}
+export type xlsChapterInfo = {id:number,grid:number[],map:string,name:string}
+export type xlsChapterLayout = {id:number,infoId:number,grid:number,type:number,correlationId:number,unlock:number}
 // type for emitter.excel
-export type xlsEmitterInfo = {id:int,name:string,icon:string,type:int,upLimit:int,restoreInterval:int,restoreNum:int,prop:int[],demand:int[],chargingType:int,chargingCost:int[],expiryTime:int}
+export type xlsEmitterInfo = {id:number,name:string,icon:string,type:number,upLimit:number,restoreInterval:number,restoreNum:number,prop:number[],demand:number[],chargingType:number,chargingCost:number[],expiryTime:number}
 // type for guide.excel
 export type xlsGuideInfo = {id:string,event:string,way:string,variable:number[],ytype:number,condition:number[],type:number,pram:any[],pram1:any[]}
 // type for help.excel
@@ -15,6 +16,7 @@ export type xlsGuideInfo = {id:string,event:string,way:string,variable:number[],
 export type xlsItemKind = {kind:string,name:string}
 export type xlsItemMoney = {id:string,name:string,icon:string,pinzhi:number,desc:string,iconshowtype:number,from:number[],produce:string,type:string,detailType:string,param:{"items"?:number[][],"nums"?:number[],"kv"?:{[key:string]:number},"count"?:number},beibao:number,isUse:number,isShowRed:number,openType:string,price:number}
 // type for kaiqi.excel
+export type xlsKaiqiInfo = {id:string,name:string,desc:string,icon:string,needGuide:number,type1:number,param1:number,sevOpenDay:number,tip:string,record:number}
 // type for languageClient.excel
 export type xlsLanguageClientText = {key:string,cn:string,us:string,kr:string,tw:string,jp:string}
 // type for languageSever.excel
@@ -25,24 +27,30 @@ export type xlsLanguageLang = {key:string,cn:string,kr:string,tw:string,jp:strin
 // type for math.excel
 export type xlsMathInfo = {key:string,pram:{"count"?:number,"count1"?:number,"str"?:string,"item"?:number[],"items"?:number[][],"kv"?:{[key:string]:number}}}
 // type for mergeProp.excel
-export type xlsMergePropInfo = {id:int,name:string,icon:string,type:int,quality:int}
+export type xlsMergePropInfo = {id:number,name:string,icon:string,type:int,quality:number}
 // type for name.excel
+export type xlsNameName = {}
 // type for package.excel
 export type xlsPackageInfo = {id:string,group:string,plat:string,wayhttp:string,cfgUrl:string,params:any[],logo:string,loadingTips1:string,loadingTips2:string}
 // type for pingbici.excel
+export type xlsPingbiciInfo = {}
 // type for shop.excel
 
 export class XlsConfig {
-    xlsLanguageClientText: xlsLanguageClientText[]
-    xlsAudioInfo: xlsAudioInfo[]
     xlsChapterInfo: xlsChapterInfo[]
     xlsChapterLayout: xlsChapterLayout[]
-    xlsPackageInfo: xlsPackageInfo[]
+    xlsKaiqiInfo: xlsKaiqiInfo[]
     xlsEmitterInfo: xlsEmitterInfo[]
-    xlsMergePropInfo: xlsMergePropInfo[]
+    xlsAttrAttr: xlsAttrAttr[]
+    xlsAudioInfo: xlsAudioInfo[]
+    xlsLanguageClientText: xlsLanguageClientText[]
     xlsGuideInfo: xlsGuideInfo[]
-    xlsMathInfo: xlsMathInfo[]
     xlsLanguageSeverHouduan: xlsLanguageSeverHouduan[]
+    xlsPackageInfo: xlsPackageInfo[]
+    xlsMergePropInfo: xlsMergePropInfo[]
+    xlsMathInfo: xlsMathInfo[]
+    xlsPingbiciInfo: xlsPingbiciInfo[]
+    xlsNameName: xlsNameName[]
     xlsItemKind: xlsItemKind[]
     xlsItemMoney: xlsItemMoney[]
     xlsLanguageLang: xlsLanguageLang[]

assets/script/data/model/Login/LoginModel.ts

@@ -3,6 +3,7 @@ import Config from "../../../Config";
 import GameController from "../../../GameController";
 import EventMng from "../../../manager/EventMng";
 import { ReqLogin } from "../../../shared/player/PtlLogin";
+import { ReqLogin as ReqLogin_1 } from "../../../shared/plat/PtlLogin";
 import ThinkingDataMgr from "../../../utils/ThinkingDataMgr";
 import { GameEvent, LoadEvent, NetworkEvent } from "../../const/EventConst";
 import { DayTipsKey, GameErrCode, PlatformType, ReportRoleType } from "../../const/TypeConst";
@@ -46,6 +47,23 @@ export default class LoginModel extends LoginModelData {
     getAccount() {
         return this.Query(this.KEY_ACCOUNT, '');
     }
+
+    // 平台登录
+    async sendPlatLoginGame(param: ReqLogin_1) {
+        let ret = await GameDataCenter.loginServer.ReqApi("plat/Login", param);
+        if (ret.isSucc) {
+            EventMng.emit(LoadEvent.LOAD_PROGRESS, 0.5, "login")
+            GameDataCenter.plat.instance.openId = ret.res.openId;
+            GameDataCenter.plat.instance.loginParams = [ret.res.token]
+            GameDataCenter.plat.instance.login()
+        } else {
+            if (gameMethod.isEmpty(ret.err) || gameMethod.isEmpty(ret.err.message)) {
+                GameDataCenter.plat.showErrDialog(GameErrCode.errGameLoginPlayer)
+                EventMng.emit(GameEvent.LOGIN_ACCOUNT_FAIL);
+            }
+        }
+    }
+
     // 账号登录
     async sendLoginGame(param: ReqLogin) {
         let ret = await GameDataCenter.loginServer.ReqApi("player/Login", param);

assets/script/logic/fgui/Login/Login/LoginCtrl.ts

@@ -34,13 +34,13 @@ export class LoginCtrl extends FguiViewCtrl<LoginVM> {
         this.RemoveListeners();
     }
     //#region UI事件
-    private AddListeners() : void {
+    private AddListeners(): void {
         this.RegisterClick(this.VM.LoginBtn, this.OnClickLoginBtn);
         EventMng.on(GameEvent.LOGIN_ACCOUNT_SUCC, this.onLoginAccountSuccess, this);
 
     }
-    private RemoveListeners() : void {
-// <#UIEventsRemoveArea>
+    private RemoveListeners(): void {
+        // <#UIEventsRemoveArea>
         EventMng.off(GameEvent.LOGIN_ACCOUNT_SUCC, this.onLoginAccountSuccess, this);
     }
     private OnClickLoginBtn(): void {
@@ -53,15 +53,17 @@ export class LoginCtrl extends FguiViewCtrl<LoginVM> {
             pid: Config.pid,
             param: [account]
         }
-        EventMng.emit(LoadEvent.LOAD_PROGRESS, 0.1, "login")
-        GameController.network.send(PlayerLogin.url, loginParam, (result: SevBack) => {
-            if (result.type == 1) {
-                EventMng.emit(LoadEvent.LOAD_PROGRESS, 0.5, "login")
-                GameDataCenter.plat.instance.openId = account
-                GameDataCenter.plat.instance.loginParams = [result.platBack.token]
-                GameDataCenter.plat.instance.login()
-            }
-        })
+        // EventMng.emit(LoadEvent.LOAD_PROGRESS, 0.1, "login")
+        // GameController.network.send(PlayerLogin.url, loginParam, (result: SevBack) => {
+        //     if (result.type == 1) {
+        //         EventMng.emit(LoadEvent.LOAD_PROGRESS, 0.5, "login")
+        //         GameDataCenter.plat.instance.openId = account
+        //         GameDataCenter.plat.instance.loginParams = [result.platBack.token]
+        //         GameDataCenter.plat.instance.login()
+        //     }
+        // })
+
+        GameDataCenter.login.sendPlatLoginGame(loginParam);
     }
 
     onLoginAccountSuccess() {
@@ -69,7 +71,7 @@ export class LoginCtrl extends FguiViewCtrl<LoginVM> {
         this.Close()
     }
 
-    private Close(): void{
+    private Close(): void {
         FguiMgr.Instance.closeUI(LoginView, true);
     }
     //#endregion

assets/script/logic/gridMap/UECell.ts

@@ -23,6 +23,13 @@ export default class UECell extends UEBase {
         this.node.zIndex = cellData.zIndex;
     }
 
+    SetCube(cube: UECube) {
+        this.cellData.ueCube = cube;
+        if (cube) {
+            this.cellData.ueCube.SetZIndex(this.cellData.zIndex);
+        }
+    }
+
 
     SetSelect(isSelect: boolean) {
         this.node_select.active = isSelect;
@@ -42,4 +49,8 @@ export default class UECell extends UEBase {
         return this.cellData.ueCube == null;
     }
 
+    MoveCubeToCell(toCell: UECell) {
+        this.cellData.ueCube.MoveToNewPos(toCell.node.position.clone());
+    }
+
 }

assets/script/logic/gridMap/UECube.ts

@@ -26,20 +26,28 @@ export default class UECube extends UEBase {
     private lbt_num: cc.Label = null!;
     @property(ResSprite)
     private sp_item: ResSprite = null!;
-
-    private originalPos: cc.Vec3 = cc.v3(0, 0);
-    cellData: I_CubeData = null!;
-    Init(cellData: I_CubeData, idx: number) {
-        this.cellData = cellData;
-        this.node.zIndex = cellData.zIndex;
-        this.lbt_num.string = idx.toString();
-        this.originalPos = this.node.position;
-        if (cellData.type == 3) {
-            let mergePropCfg = Gamecfg.mergePropInfo.getItem(cellData.id.toString());
+    originalPos: cc.Vec3 = cc.Vec3.ZERO;
+    cubeData: I_CubeData = null!;
+    Init(cubeData: I_CubeData) {
+        this.cubeData = cubeData;
+        this.SetZIndex(cubeData.zIndex);
+        this.originalPos = cc.v3(this.node.x, this.node.y);
+        if (cubeData.type == 3) {
+            let mergePropCfg = Gamecfg.mergePropInfo.getItem(cubeData.id.toString());
             this.sp_item.setSpriteFrame('gridMap', `equipIcon/${mergePropCfg.icon}`);
         }
     }
 
+    getCubeData(): I_CubeData {
+        return this.cubeData;
+    }
+
+    SetZIndex(zIndex: number) {
+        this.node.zIndex = zIndex;
+        this.cubeData.zIndex = zIndex;
+        this.lbt_num.string = zIndex.toString();
+    }
+
     /** 是否有物品可以拖动 */
     CanDrag(): boolean {
         return true;
@@ -50,26 +58,38 @@ export default class UECube extends UEBase {
     }
 
     UpdateDragPosition(pos: cc.Vec3): void {
-        if (this.itemNode) {
-            this.itemNode.position = pos.sub(this.node.position);
-        }
+        this.node.position = pos.sub(this.node.position);
     }
 
     EndDrag(): void {
-        if (this.itemNode) {
-            this.node.zIndex = this.cellData.zIndex;
-            this.PlayJellyAnim();
-        }
+        this.node.zIndex = this.cubeData.zIndex;
     }
 
     ClearCell() {
 
     }
 
+    /** 回到原来位置 */
+    BackToOriginalPos(needMove: boolean) {
+        if (needMove) {
+            cc.tween(this.node)
+                .to(0.15, { position: this.originalPos })
+                .call(() => {
+                    this.EndDrag();
+                    this.PlayJellyAnim();
+                })
+                .start();
+        } else {
+            this.itemNode.setPosition(this.originalPos.clone());
+            this.EndDrag();
+            this.PlayJellyAnim();
+        }
+
+    }
+
     /** 播放果冻效果 */
     PlayJellyAnim() {
         cc.tween(this.itemNode)
-            .to(0.15, { position: cc.Vec3.ZERO })
             .to(0.1, { scale: 1.3 })
             .to(0.1, { scale: 0.9 })
             .to(0.08, { scale: 1 })
@@ -86,6 +106,18 @@ export default class UECube extends UEBase {
             .start();
     }
 
+    /** 移动到新的位置 */
+    MoveToNewPos(newPos: cc.Vec3, duration: number = 0.2) {
+        cc.tween(this.node)
+            .to(duration, { position: newPos })
+            .call(() => {
+                this.EndDrag();
+                this.PlayJellyAnim();
+            })
+            .start();
+        this.originalPos = newPos.clone();
+    }
+
     private UpdateItemDisplay(): void {
         // 根据 itemType 和 itemLevel 更新物品显示
         if (this.itemNode) {

assets/script/logic/gridMap/UEGridMap.ts

@@ -136,7 +136,12 @@ export default class UEGridMap extends UEBase {
         }
 
         if (this.isDragging) {
-            this.selectedCell.GetCube().UpdateDragPosition(cc.v3(touchPos.x, touchPos.y));
+            // 计算移动差值并应用到cube节点
+            const deltaPos = touchPos.sub(this.dragStartPos);
+            const cube = this.selectedCell.GetCube();
+            const originalPos = cube.node.getPosition();
+            cube.node.setPosition(originalPos.x + deltaPos.x, originalPos.y + deltaPos.y);
+            this.dragStartPos = touchPos;
         }
     }
 
@@ -160,8 +165,9 @@ export default class UEGridMap extends UEBase {
                 this.TryMergeItems(this.selectedCell, targetCell);
                 this.selectedCell.SetSelect(false);
                 targetCell.SetSelect(true);
+            } else {
+                this.selectedCell.GetCube().BackToOriginalPos(true);
             }
-            this.selectedCell.GetCube().EndDrag();
             this.isDragging = false;
             this.selectedCell = targetCell;
         }
@@ -184,32 +190,36 @@ export default class UEGridMap extends UEBase {
 
     /** 尝试合成 */
     private TryMergeItems(fromCell: UECell, toCell: UECell): void {
-        // if (toCell.cellData.type == 0) {
-        //     //格子上没有物品
+        if (toCell.IsEmpty()) {
+            //格子上没有物品
+            fromCell.MoveCubeToCell(toCell);
+            toCell.SetCube(fromCell.GetCube());
+            fromCell.SetCube(null);
+        } else if (this.CanMergeItems(fromCell, toCell)) {
+            toCell.GetCube().PlayMergeAnim();
+        } else {
+            this.SwitchCell(fromCell, toCell);
+        }
+    }
 
-        // } else if (fromCell.cellData.type == toCell.cellData.type &&
-        //     fromCell.cellData.id != toCell.cellData.id &&
-        //     fromCell.cellData.level == toCell.cellData.level) {
-        //     toCell.PlayMergeAnim();
-        // } else {
+    private CanMergeItems(fromCell: UECell, toCell: UECell): boolean {
+        if (fromCell.GetCube().getCubeData().type == toCell.GetCube().getCubeData().type
+            && fromCell.GetCube().getCubeData().id != fromCell.GetCube().getCubeData().id
+        ) {
+            return true;
+        }
 
-        // }
+        return false;
     }
 
     private SwitchCell(fromCell: UECell, toCell: UECell): void {
         //交换格子
-        const tempData = fromCell.cellData;
-        fromCell.cellData = toCell.cellData;
-        toCell.cellData = tempData;
-        // fromCell.UpdateCell();
-        // toCell.UpdateCell();
-        cc.tween(toCell.node)
-            .to(0.3, { position: fromCell.node.position })
-            .call(() => {
-                // fromCell.UpdateCell();
-                // toCell.UpdateCell();
-            })
-            .start();
+        let fromCube = fromCell.GetCube();
+        let toCube = toCell.GetCube();
+        fromCell.SetCube(toCube);
+        toCell.SetCube(fromCube);
+        toCube.MoveToNewPos(cc.v3(fromCell.node.x, fromCell.node.y));
+        fromCube.MoveToNewPos(cc.v3(toCell.node.x, toCell.node.y), 0.05);
     }
 
     /** 抛出新的物品 */

assets/script/logic/ui/scene/UILoading.ts

@@ -192,7 +192,7 @@ export default class UILoading extends cc.Component {
 			this.setLoginSid(GameDataCenter.login.playerInfo.sid)
 		}
 
-		let showPolicy = GameDataCenter.sevBack.switch?.["showPolicy"]?.[Config.pid] ?? 0;
+		let showPolicy = GameDataCenter.sevBack?.switch?.["showPolicy"]?.[Config.pid] ?? 0;
 		if (this.togglePolicy.isChecked == false && showPolicy == 1) {
 			this.onClickPolicy();
 		}

assets/script/shared/admin/PtlDeleteSetting.ts

@@ -0,0 +1,18 @@
+
+
+// 定义请求参数
+export interface ReqDeleteSetting {
+    key: string
+}
+
+// 定义返回字段
+export interface ResDeleteSetting {
+    order10Back: any
+}
+
+export const conf = {
+    connet: "ws"
+}
+
+
+

assets/script/shared/admin/PtlDeleteSetting.ts.meta

@@ -0,0 +1,10 @@
+{
+  "ver": "1.1.0",
+  "uuid": "90c1f531-8173-469b-9cc6-0ea157db433f",
+  "importer": "typescript",
+  "isPlugin": false,
+  "loadPluginInWeb": true,
+  "loadPluginInNative": true,
+  "loadPluginInEditor": false,
+  "subMetas": {}
+}

assets/script/shared/admin/PtlGetListBySid.ts

@@ -0,0 +1,18 @@
+
+
+// 定义请求参数
+export interface ReqGetListBySid {
+
+}
+
+// 定义返回字段
+export interface ResGetListBySid {
+
+}
+
+export const conf = {
+    connet: "ws"
+}
+
+
+

assets/script/shared/admin/PtlGetListBySid.ts.meta

@@ -0,0 +1,10 @@
+{
+  "ver": "1.1.0",
+  "uuid": "33ec9c99-2c46-46e3-8444-5b43357c5b3e",
+  "importer": "typescript",
+  "isPlugin": false,
+  "loadPluginInWeb": true,
+  "loadPluginInNative": true,
+  "loadPluginInEditor": false,
+  "subMetas": {}
+}

assets/script/shared/admin/PtlGetSetting.ts

@@ -0,0 +1,18 @@
+
+
+// 定义请求参数
+export interface ReqGetSetting {
+
+}
+
+// 定义返回字段
+export interface ResGetSetting {
+    order10Back:any
+}
+
+export const conf = {
+    connet: "admin"
+}
+
+
+

assets/script/shared/admin/PtlGetSetting.ts.meta

@@ -0,0 +1,10 @@
+{
+  "ver": "1.1.0",
+  "uuid": "fb6e13c0-92e7-45c6-8453-65729bff4195",
+  "importer": "typescript",
+  "isPlugin": false,
+  "loadPluginInWeb": true,
+  "loadPluginInNative": true,
+  "loadPluginInEditor": false,
+  "subMetas": {}
+}

assets/script/shared/admin/PtlGetVer.ts

@@ -0,0 +1,18 @@
+
+
+// 定义请求参数
+export interface ReqGetVer {
+
+}
+
+// 定义返回字段
+export interface ResGetVer {
+
+}
+
+export const conf = {
+    connet: "ws"
+}
+
+
+

assets/script/shared/admin/PtlGetVer.ts.meta

@@ -0,0 +1,10 @@
+{
+  "ver": "1.1.0",
+  "uuid": "41e9ccf2-10ac-43cc-b395-b1f0edbe0fc4",
+  "importer": "typescript",
+  "isPlugin": false,
+  "loadPluginInWeb": true,
+  "loadPluginInNative": true,
+  "loadPluginInEditor": false,
+  "subMetas": {}
+}

assets/script/shared/admin/PtlHuodongAdd.ts

@@ -0,0 +1,18 @@
+
+
+// 定义请求参数
+export interface ReqHuodongAdd {
+
+}
+
+// 定义返回字段
+export interface ResHuodongAdd {
+
+}
+
+export const conf = {
+    connet: "ws"
+}
+
+
+

assets/script/shared/admin/PtlHuodongAdd.ts.meta

@@ -0,0 +1,10 @@
+{
+  "ver": "1.1.0",
+  "uuid": "7cd4639b-59b8-4059-abe3-73c4cb237d97",
+  "importer": "typescript",
+  "isPlugin": false,
+  "loadPluginInWeb": true,
+  "loadPluginInNative": true,
+  "loadPluginInEditor": false,
+  "subMetas": {}
+}

assets/script/shared/admin/PtlHuodongDelete.ts

@@ -0,0 +1,18 @@
+
+
+// 定义请求参数
+export interface ReqHuodongDelete {
+
+}
+
+// 定义返回字段
+export interface ResHuodongDelete {
+
+}
+
+export const conf = {
+    connet: "ws"
+}
+
+
+

assets/script/shared/admin/PtlHuodongDelete.ts.meta

@@ -0,0 +1,10 @@
+{
+  "ver": "1.1.0",
+  "uuid": "cbba2d96-7e67-464a-8b7c-b20d3e047cf2",
+  "importer": "typescript",
+  "isPlugin": false,
+  "loadPluginInWeb": true,
+  "loadPluginInNative": true,
+  "loadPluginInEditor": false,
+  "subMetas": {}
+}

assets/script/shared/admin/PtlHuodongEdit.ts

@@ -0,0 +1,18 @@
+
+
+// 定义请求参数
+export interface ReqHuodongEdit {
+
+}
+
+// 定义返回字段
+export interface ResHuodongEdit {
+
+}
+
+export const conf = {
+    connet: "ws"
+}
+
+
+

assets/script/shared/admin/PtlHuodongEdit.ts.meta

@@ -0,0 +1,10 @@
+{
+  "ver": "1.1.0",
+  "uuid": "887e1234-14f0-4357-a1f3-4c918b8876e0",
+  "importer": "typescript",
+  "isPlugin": false,
+  "loadPluginInWeb": true,
+  "loadPluginInNative": true,
+  "loadPluginInEditor": false,
+  "subMetas": {}
+}

assets/script/shared/admin/PtlHuodongFind.ts

@@ -0,0 +1,18 @@
+
+
+// 定义请求参数
+export interface ReqHuodongFind {
+
+}
+
+// 定义返回字段
+export interface ResHuodongFind {
+
+}
+
+export const conf = {
+    connet: "ws"
+}
+
+
+

assets/script/shared/admin/PtlHuodongFind.ts.meta

@@ -0,0 +1,10 @@
+{
+  "ver": "1.1.0",
+  "uuid": "b82bfe69-ca0e-4389-a4d1-e1863a51bc3f",
+  "importer": "typescript",
+  "isPlugin": false,
+  "loadPluginInWeb": true,
+  "loadPluginInNative": true,
+  "loadPluginInEditor": false,
+  "subMetas": {}
+}

assets/script/shared/admin/PtlUpdateSetting.ts

@@ -0,0 +1,19 @@
+
+
+// 定义请求参数
+export interface ReqUpdateSetting {
+    key:string
+    param:any
+}
+
+// 定义返回字段
+export interface ResUpdateSetting {
+    order10Back:any
+}
+
+export const conf = {
+    connet: "ws"
+}
+
+
+

assets/script/shared/admin/PtlUpdateSetting.ts.meta

@@ -0,0 +1,10 @@
+{
+  "ver": "1.1.0",
+  "uuid": "1ea5a96c-0f5e-4fdc-b970-bb3524b57338",
+  "importer": "typescript",
+  "isPlugin": false,
+  "loadPluginInWeb": true,
+  "loadPluginInNative": true,
+  "loadPluginInEditor": false,
+  "subMetas": {}
+}

assets/script/shared/common.meta

@@ -0,0 +1,13 @@
+{
+  "ver": "1.1.3",
+  "uuid": "28abd932-0e4c-42a7-9934-bfca0a2303f9",
+  "importer": "folder",
+  "isBundle": false,
+  "bundleName": "",
+  "priority": 1,
+  "compressionType": {},
+  "optimizeHotUpdate": {},
+  "inlineSpriteFrames": {},
+  "isRemoteBundle": {},
+  "subMetas": {}
+}

assets/script/shared/common/MsgItems.ts

@@ -0,0 +1,7 @@
+
+
+//通用道具弹窗提示
+export interface MsgItems {
+    items:number[]
+}
+

assets/script/shared/common/MsgItems.ts.meta

@@ -0,0 +1,10 @@
+{
+  "ver": "1.1.0",
+  "uuid": "cfa2dfca-2374-478a-b609-541b2d47a5ee",
+  "importer": "typescript",
+  "isPlugin": false,
+  "loadPluginInWeb": true,
+  "loadPluginInNative": true,
+  "loadPluginInEditor": false,
+  "subMetas": {}
+}

assets/script/shared/common/MsgMessage.ts

@@ -0,0 +1,7 @@
+
+
+//通用飘文字提示
+export interface MsgMessage {
+    message:string
+}
+

assets/script/shared/common/MsgMessage.ts.meta

@@ -0,0 +1,10 @@
+{
+  "ver": "1.1.0",
+  "uuid": "98a690a3-f30f-4f7b-9552-c10e21a5b491",
+  "importer": "typescript",
+  "isPlugin": false,
+  "loadPluginInWeb": true,
+  "loadPluginInNative": true,
+  "loadPluginInEditor": false,
+  "subMetas": {}
+}

assets/script/shared/eps.meta

@@ -0,0 +1,13 @@
+{
+  "ver": "1.1.3",
+  "uuid": "ff2b6a53-9408-42cd-8539-9027a0b4b765",
+  "importer": "folder",
+  "isBundle": false,
+  "bundleName": "",
+  "priority": 1,
+  "compressionType": {},
+  "optimizeHotUpdate": {},
+  "inlineSpriteFrames": {},
+  "isRemoteBundle": {},
+  "subMetas": {}
+}

assets/script/shared/eps/client.meta

@@ -0,0 +1,13 @@
+{
+  "ver": "1.1.3",
+  "uuid": "e0a4d758-37ef-4bf7-a9f8-f7b0c999c0fd",
+  "importer": "folder",
+  "isBundle": false,
+  "bundleName": "",
+  "priority": 1,
+  "compressionType": {},
+  "optimizeHotUpdate": {},
+  "inlineSpriteFrames": {},
+  "isRemoteBundle": {},
+  "subMetas": {}
+}

assets/script/shared/eps/client/MsgEpsInfo.ts

@@ -0,0 +1,6 @@
+
+
+// 定义返回字段
+export interface MsgEpsInfo {
+
+}

assets/script/shared/eps/client/MsgEpsInfo.ts.meta

@@ -0,0 +1,10 @@
+{
+  "ver": "1.1.0",
+  "uuid": "5cf58d45-afd9-4eb7-88a3-91964ca8d4ed",
+  "importer": "typescript",
+  "isPlugin": false,
+  "loadPluginInWeb": true,
+  "loadPluginInNative": true,
+  "loadPluginInEditor": false,
+  "subMetas": {}
+}

assets/script/shared/eps/server.meta

@@ -0,0 +1,13 @@
+{
+  "ver": "1.1.3",
+  "uuid": "880b204f-4eca-46f5-9063-09d8d2fd7f58",
+  "importer": "folder",
+  "isBundle": false,
+  "bundleName": "",
+  "priority": 1,
+  "compressionType": {},
+  "optimizeHotUpdate": {},
+  "inlineSpriteFrames": {},
+  "isRemoteBundle": {},
+  "subMetas": {}
+}

assets/script/shared/eps/server/MsgEpsChange.ts

@@ -0,0 +1,7 @@
+
+
+// 定义返回字段
+export interface MsgEpsChange {
+    [id: string]: number; //属性信息
+}
+

assets/script/shared/eps/server/MsgEpsChange.ts.meta

@@ -0,0 +1,10 @@
+{
+  "ver": "1.1.0",
+  "uuid": "7abab1ed-d6dd-401c-93fb-da7fae34488c",
+  "importer": "typescript",
+  "isPlugin": false,
+  "loadPluginInWeb": true,
+  "loadPluginInNative": true,
+  "loadPluginInEditor": false,
+  "subMetas": {}
+}

assets/script/shared/eps/server/MsgEpsInfo.ts

@@ -0,0 +1,7 @@
+
+
+// 定义返回字段
+export interface MsgEpsInfo {
+    [id: string]: number; //属性信息
+}
+

assets/script/shared/eps/server/MsgEpsInfo.ts.meta

@@ -0,0 +1,10 @@
+{
+  "ver": "1.1.0",
+  "uuid": "4f24f23c-eb5f-482a-b9a6-011db3c15128",
+  "importer": "typescript",
+  "isPlugin": false,
+  "loadPluginInWeb": true,
+  "loadPluginInNative": true,
+  "loadPluginInEditor": false,
+  "subMetas": {}
+}

assets/script/shared/item.meta

@@ -0,0 +1,13 @@
+{
+  "ver": "1.1.3",
+  "uuid": "74f84ce1-49eb-430f-b75c-f8b70edf202a",
+  "importer": "folder",
+  "isBundle": false,
+  "bundleName": "",
+  "priority": 1,
+  "compressionType": {},
+  "optimizeHotUpdate": {},
+  "inlineSpriteFrames": {},
+  "isRemoteBundle": {},
+  "subMetas": {}
+}

assets/script/shared/item/client.meta

@@ -0,0 +1,13 @@
+{
+  "ver": "1.1.3",
+  "uuid": "874409b4-5baa-461c-869a-741664089b0e",
+  "importer": "folder",
+  "isBundle": false,
+  "bundleName": "",
+  "priority": 1,
+  "compressionType": {},
+  "optimizeHotUpdate": {},
+  "inlineSpriteFrames": {},
+  "isRemoteBundle": {},
+  "subMetas": {}
+}

assets/script/shared/item/client/MsgItemInfo.ts

@@ -0,0 +1,8 @@
+
+
+// 请求道具列表
+export interface MsgItemInfo {
+
+}
+
+

assets/script/shared/item/client/MsgItemInfo.ts.meta

@@ -0,0 +1,10 @@
+{
+  "ver": "1.1.0",
+  "uuid": "fb031c1e-347a-40da-ad92-92fc9f142db5",
+  "importer": "typescript",
+  "isPlugin": false,
+  "loadPluginInWeb": true,
+  "loadPluginInNative": true,
+  "loadPluginInEditor": false,
+  "subMetas": {}
+}

assets/script/shared/item/server.meta

@@ -0,0 +1,13 @@
+{
+  "ver": "1.1.3",
+  "uuid": "ac6fb76c-de35-4798-95b7-c90fd62fb60b",
+  "importer": "folder",
+  "isBundle": false,
+  "bundleName": "",
+  "priority": 1,
+  "compressionType": {},
+  "optimizeHotUpdate": {},
+  "inlineSpriteFrames": {},
+  "isRemoteBundle": {},
+  "subMetas": {}
+}

assets/script/shared/item/server/MsgItemChange.ts

@@ -0,0 +1,7 @@
+
+
+// 道具数量发生改变下发
+export interface MsgItemChange {
+    [itemid:string]:number
+}
+

assets/script/shared/item/server/MsgItemChange.ts.meta

@@ -0,0 +1,10 @@
+{
+  "ver": "1.1.0",
+  "uuid": "1fc2b09b-a8be-4c9c-a301-c80d9b8fc5cf",
+  "importer": "typescript",
+  "isPlugin": false,
+  "loadPluginInWeb": true,
+  "loadPluginInNative": true,
+  "loadPluginInEditor": false,
+  "subMetas": {}
+}

assets/script/shared/item/server/MsgItemInfo.ts

@@ -0,0 +1,7 @@
+
+
+// 道具列表
+export interface MsgItemInfo {
+    [itemid:string]:number
+}
+

assets/script/shared/item/server/MsgItemInfo.ts.meta

@@ -0,0 +1,10 @@
+{
+  "ver": "1.1.0",
+  "uuid": "ce304770-6a09-46fb-b807-10de609b51d3",
+  "importer": "typescript",
+  "isPlugin": false,
+  "loadPluginInWeb": true,
+  "loadPluginInNative": true,
+  "loadPluginInEditor": false,
+  "subMetas": {}
+}

assets/script/shared/plat.meta

@@ -0,0 +1,13 @@
+{
+  "ver": "1.1.3",
+  "uuid": "41e88991-be1c-4dbe-b707-8acf0fb21855",
+  "importer": "folder",
+  "isBundle": false,
+  "bundleName": "",
+  "priority": 1,
+  "compressionType": {},
+  "optimizeHotUpdate": {},
+  "inlineSpriteFrames": {},
+  "isRemoteBundle": {},
+  "subMetas": {}
+}

assets/script/shared/plat/PtlLogin.ts

@@ -0,0 +1,20 @@
+
+
+// 定义请求参数
+export interface ReqLogin {
+    pid:string; //包ID
+    param:string[]; //参数
+}
+
+// 定义返回字段
+export interface ResLogin {
+    openId:string
+    token:string
+}
+
+export const conf = {
+    connet: "http"
+}
+
+
+

assets/script/shared/plat/PtlLogin.ts.meta

@@ -0,0 +1,10 @@
+{
+  "ver": "1.1.0",
+  "uuid": "58cff60b-9143-4193-92e8-f5d695713bdb",
+  "importer": "typescript",
+  "isPlugin": false,
+  "loadPluginInWeb": true,
+  "loadPluginInNative": true,
+  "loadPluginInEditor": false,
+  "subMetas": {}
+}

assets/script/shared/serviceProto.ts

@@ -1,11 +1,29 @@
 import { ServiceProto } from 'tsrpc-proto';
 import { ReqdeleteQuFu, ResdeleteQuFu } from './admin/PtldeleteQuFu';
+import { ReqDeleteSetting, ResDeleteSetting } from './admin/PtlDeleteSetting';
+import { ReqGetListBySid, ResGetListBySid } from './admin/PtlGetListBySid';
 import { ReqgetNeed, ResgetNeed } from './admin/PtlgetNeed';
 import { ReqgetQuFu, ResgetQuFu } from './admin/PtlgetQuFu';
+import { ReqGetSetting, ResGetSetting } from './admin/PtlGetSetting';
+import { ReqGetVer, ResGetVer } from './admin/PtlGetVer';
+import { ReqHuodongAdd, ResHuodongAdd } from './admin/PtlHuodongAdd';
+import { ReqHuodongDelete, ResHuodongDelete } from './admin/PtlHuodongDelete';
+import { ReqHuodongEdit, ResHuodongEdit } from './admin/PtlHuodongEdit';
+import { ReqHuodongFind, ResHuodongFind } from './admin/PtlHuodongFind';
 import { RequpdateQuFu, ResupdateQuFu } from './admin/PtlupdateQuFu';
-import { ReqLogin, ResLogin } from './player/PtlLogin';
+import { ReqUpdateSetting, ResUpdateSetting } from './admin/PtlUpdateSetting';
+import { MsgItems } from './common/MsgItems';
+import { MsgMessage } from './common/MsgMessage';
+import { MsgEpsInfo } from './eps/client/MsgEpsInfo';
+import { MsgEpsChange } from './eps/server/MsgEpsChange';
+import { MsgEpsInfo as MsgEpsInfo_1 } from './eps/server/MsgEpsInfo';
+import { MsgItemInfo } from './item/client/MsgItemInfo';
+import { MsgItemChange } from './item/server/MsgItemChange';
+import { MsgItemInfo as MsgItemInfo_1 } from './item/server/MsgItemInfo';
+import { ReqLogin, ResLogin } from './plat/PtlLogin';
+import { ReqLogin as ReqLogin_1, ResLogin as ResLogin_1 } from './player/PtlLogin';
 import { MsgSetName } from './user/client/MsgSetName';
-import { ReqLogin as ReqLogin_1, ResLogin as ResLogin_1 } from './user/PtlLogin';
+import { ReqLogin as ReqLogin_2, ResLogin as ResLogin_2 } from './user/PtlLogin';
 import { MsgSetName as MsgSetName_1 } from './user/server/MsgSetName';
 
 export interface ServiceType {
@@ -14,6 +32,14 @@ export interface ServiceType {
             req: ReqdeleteQuFu,
             res: ResdeleteQuFu
         },
+        "admin/DeleteSetting": {
+            req: ReqDeleteSetting,
+            res: ResDeleteSetting
+        },
+        "admin/GetListBySid": {
+            req: ReqGetListBySid,
+            res: ResGetListBySid
+        },
         "admin/getNeed": {
             req: ReqgetNeed,
             res: ResgetNeed
@@ -22,27 +48,67 @@ export interface ServiceType {
             req: ReqgetQuFu,
             res: ResgetQuFu
         },
+        "admin/GetSetting": {
+            req: ReqGetSetting,
+            res: ResGetSetting
+        },
+        "admin/GetVer": {
+            req: ReqGetVer,
+            res: ResGetVer
+        },
+        "admin/HuodongAdd": {
+            req: ReqHuodongAdd,
+            res: ResHuodongAdd
+        },
+        "admin/HuodongDelete": {
+            req: ReqHuodongDelete,
+            res: ResHuodongDelete
+        },
+        "admin/HuodongEdit": {
+            req: ReqHuodongEdit,
+            res: ResHuodongEdit
+        },
+        "admin/HuodongFind": {
+            req: ReqHuodongFind,
+            res: ResHuodongFind
+        },
         "admin/updateQuFu": {
             req: RequpdateQuFu,
             res: ResupdateQuFu
         },
-        "player/Login": {
+        "admin/UpdateSetting": {
+            req: ReqUpdateSetting,
+            res: ResUpdateSetting
+        },
+        "plat/Login": {
             req: ReqLogin,
             res: ResLogin
         },
-        "user/Login": {
+        "player/Login": {
             req: ReqLogin_1,
             res: ResLogin_1
+        },
+        "user/Login": {
+            req: ReqLogin_2,
+            res: ResLogin_2
         }
     },
     msg: {
+        "common/Items": MsgItems,
+        "common/Message": MsgMessage,
+        "eps/client/EpsInfo": MsgEpsInfo,
+        "eps/server/EpsChange": MsgEpsChange,
+        "eps/server/EpsInfo": MsgEpsInfo_1,
+        "item/client/ItemInfo": MsgItemInfo,
+        "item/server/ItemChange": MsgItemChange,
+        "item/server/ItemInfo": MsgItemInfo_1,
         "user/client/SetName": MsgSetName,
         "user/server/SetName": MsgSetName_1
     }
 }
 
 export const serviceProto: ServiceProto<ServiceType> = {
-    "version": 12,
+    "version": 19,
     "services": [
         {
             "id": 5,
@@ -53,6 +119,22 @@ export const serviceProto: ServiceProto<ServiceType> = {
             }
         },
         {
+            "id": 23,
+            "name": "admin/DeleteSetting",
+            "type": "api",
+            "conf": {
+                "connet": "ws"
+            }
+        },
+        {
+            "id": 24,
+            "name": "admin/GetListBySid",
+            "type": "api",
+            "conf": {
+                "connet": "ws"
+            }
+        },
+        {
             "id": 6,
             "name": "admin/getNeed",
             "type": "api",
@@ -69,6 +151,54 @@ export const serviceProto: ServiceProto<ServiceType> = {
             }
         },
         {
+            "id": 25,
+            "name": "admin/GetSetting",
+            "type": "api",
+            "conf": {
+                "connet": "admin"
+            }
+        },
+        {
+            "id": 26,
+            "name": "admin/GetVer",
+            "type": "api",
+            "conf": {
+                "connet": "ws"
+            }
+        },
+        {
+            "id": 27,
+            "name": "admin/HuodongAdd",
+            "type": "api",
+            "conf": {
+                "connet": "ws"
+            }
+        },
+        {
+            "id": 28,
+            "name": "admin/HuodongDelete",
+            "type": "api",
+            "conf": {
+                "connet": "ws"
+            }
+        },
+        {
+            "id": 29,
+            "name": "admin/HuodongEdit",
+            "type": "api",
+            "conf": {
+                "connet": "ws"
+            }
+        },
+        {
+            "id": 30,
+            "name": "admin/HuodongFind",
+            "type": "api",
+            "conf": {
+                "connet": "ws"
+            }
+        },
+        {
             "id": 8,
             "name": "admin/updateQuFu",
             "type": "api",
@@ -77,6 +207,62 @@ export const serviceProto: ServiceProto<ServiceType> = {
             }
         },
         {
+            "id": 31,
+            "name": "admin/UpdateSetting",
+            "type": "api",
+            "conf": {
+                "connet": "ws"
+            }
+        },
+        {
+            "id": 18,
+            "name": "common/Items",
+            "type": "msg"
+        },
+        {
+            "id": 19,
+            "name": "common/Message",
+            "type": "msg"
+        },
+        {
+            "id": 20,
+            "name": "eps/client/EpsInfo",
+            "type": "msg"
+        },
+        {
+            "id": 21,
+            "name": "eps/server/EpsChange",
+            "type": "msg"
+        },
+        {
+            "id": 22,
+            "name": "eps/server/EpsInfo",
+            "type": "msg"
+        },
+        {
+            "id": 13,
+            "name": "item/client/ItemInfo",
+            "type": "msg"
+        },
+        {
+            "id": 14,
+            "name": "item/server/ItemChange",
+            "type": "msg"
+        },
+        {
+            "id": 15,
+            "name": "item/server/ItemInfo",
+            "type": "msg"
+        },
+        {
+            "id": 32,
+            "name": "plat/Login",
+            "type": "api",
+            "conf": {
+                "connet": "http"
+            }
+        },
+        {
             "id": 3,
             "name": "player/Login",
             "type": "api",
@@ -87,10 +273,7 @@ export const serviceProto: ServiceProto<ServiceType> = {
         {
             "id": 11,
             "name": "user/client/SetName",
-            "type": "msg",
-            "conf": {
-                "connet": "ws"
-            }
+            "type": "msg"
         },
         {
             "id": 4,
@@ -131,6 +314,36 @@ export const serviceProto: ServiceProto<ServiceType> = {
                 }
             ]
         },
+        "admin/PtlDeleteSetting/ReqDeleteSetting": {
+            "type": "Interface",
+            "properties": [
+                {
+                    "id": 0,
+                    "name": "key",
+                    "type": {
+                        "type": "String"
+                    }
+                }
+            ]
+        },
+        "admin/PtlDeleteSetting/ResDeleteSetting": {
+            "type": "Interface",
+            "properties": [
+                {
+                    "id": 0,
+                    "name": "order10Back",
+                    "type": {
+                        "type": "Any"
+                    }
+                }
+            ]
+        },
+        "admin/PtlGetListBySid/ReqGetListBySid": {
+            "type": "Interface"
+        },
+        "admin/PtlGetListBySid/ResGetListBySid": {
+            "type": "Interface"
+        },
         "admin/PtlgetNeed/ReqgetNeed": {
             "type": "Interface",
             "properties": [
@@ -177,6 +390,51 @@ export const serviceProto: ServiceProto<ServiceType> = {
                 }
             ]
         },
+        "admin/PtlGetSetting/ReqGetSetting": {
+            "type": "Interface"
+        },
+        "admin/PtlGetSetting/ResGetSetting": {
+            "type": "Interface",
+            "properties": [
+                {
+                    "id": 0,
+                    "name": "order10Back",
+                    "type": {
+                        "type": "Any"
+                    }
+                }
+            ]
+        },
+        "admin/PtlGetVer/ReqGetVer": {
+            "type": "Interface"
+        },
+        "admin/PtlGetVer/ResGetVer": {
+            "type": "Interface"
+        },
+        "admin/PtlHuodongAdd/ReqHuodongAdd": {
+            "type": "Interface"
+        },
+        "admin/PtlHuodongAdd/ResHuodongAdd": {
+            "type": "Interface"
+        },
+        "admin/PtlHuodongDelete/ReqHuodongDelete": {
+            "type": "Interface"
+        },
+        "admin/PtlHuodongDelete/ResHuodongDelete": {
+            "type": "Interface"
+        },
+        "admin/PtlHuodongEdit/ReqHuodongEdit": {
+            "type": "Interface"
+        },
+        "admin/PtlHuodongEdit/ResHuodongEdit": {
+            "type": "Interface"
+        },
+        "admin/PtlHuodongFind/ReqHuodongFind": {
+            "type": "Interface"
+        },
+        "admin/PtlHuodongFind/ResHuodongFind": {
+            "type": "Interface"
+        },
         "admin/PtlupdateQuFu/RequpdateQuFu": {
             "type": "Interface",
             "properties": [
@@ -214,6 +472,147 @@ export const serviceProto: ServiceProto<ServiceType> = {
                 }
             ]
         },
+        "admin/PtlUpdateSetting/ReqUpdateSetting": {
+            "type": "Interface",
+            "properties": [
+                {
+                    "id": 0,
+                    "name": "key",
+                    "type": {
+                        "type": "String"
+                    }
+                },
+                {
+                    "id": 1,
+                    "name": "param",
+                    "type": {
+                        "type": "Any"
+                    }
+                }
+            ]
+        },
+        "admin/PtlUpdateSetting/ResUpdateSetting": {
+            "type": "Interface",
+            "properties": [
+                {
+                    "id": 0,
+                    "name": "order10Back",
+                    "type": {
+                        "type": "Any"
+                    }
+                }
+            ]
+        },
+        "common/MsgItems/MsgItems": {
+            "type": "Interface",
+            "properties": [
+                {
+                    "id": 0,
+                    "name": "items",
+                    "type": {
+                        "type": "Array",
+                        "elementType": {
+                            "type": "Number"
+                        }
+                    }
+                }
+            ]
+        },
+        "common/MsgMessage/MsgMessage": {
+            "type": "Interface",
+            "properties": [
+                {
+                    "id": 0,
+                    "name": "message",
+                    "type": {
+                        "type": "String"
+                    }
+                }
+            ]
+        },
+        "eps/client/MsgEpsInfo/MsgEpsInfo": {
+            "type": "Interface"
+        },
+        "eps/server/MsgEpsChange/MsgEpsChange": {
+            "type": "Interface",
+            "indexSignature": {
+                "keyType": "String",
+                "type": {
+                    "type": "Number"
+                }
+            }
+        },
+        "eps/server/MsgEpsInfo/MsgEpsInfo": {
+            "type": "Interface",
+            "indexSignature": {
+                "keyType": "String",
+                "type": {
+                    "type": "Number"
+                }
+            }
+        },
+        "item/client/MsgItemInfo/MsgItemInfo": {
+            "type": "Interface"
+        },
+        "item/server/MsgItemChange/MsgItemChange": {
+            "type": "Interface",
+            "indexSignature": {
+                "keyType": "String",
+                "type": {
+                    "type": "Number"
+                }
+            }
+        },
+        "item/server/MsgItemInfo/MsgItemInfo": {
+            "type": "Interface",
+            "indexSignature": {
+                "keyType": "String",
+                "type": {
+                    "type": "Number"
+                }
+            }
+        },
+        "plat/PtlLogin/ReqLogin": {
+            "type": "Interface",
+            "properties": [
+                {
+                    "id": 0,
+                    "name": "pid",
+                    "type": {
+                        "type": "String"
+                    }
+                },
+                {
+                    "id": 1,
+                    "name": "param",
+                    "type": {
+                        "type": "Array",
+                        "elementType": {
+                            "type": "String"
+                        }
+                    }
+                }
+            ]
+        },
+        "plat/PtlLogin/ResLogin": {
+            "type": "Interface",
+            "properties": [
+                {
+                    "id": 0,
+                    "name": "openId",
+                    "type": {
+                        "type": "String"
+                    }
+                },
+                {
+                    "id": 1,
+                    "name": "token",
+                    "type": {
+                        "type": "String"
+                    }
+                }
+            ]
+        },
         "player/PtlLogin/ReqLogin": {
             "type": "Interface",
             "properties": [

assets/script/shared/user/client/MsgSetName.ts

@@ -1,10 +1,4 @@
-
-
-// 定义返回字段
+// 修改名字
 export interface MsgSetName {
     name:string;
 }
-export const conf = {
-    connet: "ws"
-}
-

assets/script/shared/user/server/MsgSetName.ts

@@ -1,6 +1,6 @@
 
 
-// 定义返回字段
+// 返回修改后名字
 export interface MsgSetName {
     name:string
 }