jianghe2nd/mota-js
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

Remove isEquipment

Browse Source
This commit is contained in:
oc 2018-05-06 20:43:25 +08:00
parent 992511160e
commit 4ecac00f6d
6 changed files with 10 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
_server/comment.js
View File

@ -33,12 +33,6 @@ comment_c456ea59_6018_45ef_8bcc_211a24c627dc =
"_leaf": true, "_leaf": true,
"_type": "textarea", "_type": "textarea",
"_data": "道具在道具栏中显示的描述" "_data": "道具在道具栏中显示的描述"
},
"isEquipment": {
"_leaf": true,
"_type": "checkbox",
"_bool": "bool",
"_data": "物品是否属于装备(仅在全塔属性的equipment为true时有效)"
} }
} }
}, },

6
_server/data.comment.js
View File

@ -50,17 +50,17 @@ data_comment_c456ea59_6018_45ef_8bcc_211a24c627dc =
"statusLeftBackground": { "statusLeftBackground": {
"_leaf": true, "_leaf": true,
"_type": "textarea", "_type": "textarea",
"_data": "横屏时左侧状态栏的背景样式，可以定义背景图、平铺方式等。\n具体请网上搜索\"css background\"了解写法。\n如果弄一张图片作为背景图，推荐写法：\n\"url(project/images/XXX.png) 0 0/100% 100% no-repeat\"" "_data": "横屏时左侧状态栏的背景样式，可以定义背景图、平铺方式等。\n具体请网上搜索\"css background\"了解写法。\n如果弄一张图片作为背景图，推荐写法：\n\"url(project/images/XXX.png) 0 0/100% 100% no-repeat\"\n图片最好进行一些压缩等操作节省流量。"
}, },
"statusTopBackground": { "statusTopBackground": {
"_leaf": true, "_leaf": true,
"_type": "textarea", "_type": "textarea",
"_data": "竖屏时上方状态栏的背景样式，可以定义背景图、平铺方式等。\n具体请网上搜索\"css background\"了解写法。\n如果弄一张图片作为背景图，推荐写法：\n\"url(project/images/XXX.png) 0 0/100% 100% no-repeat\"" "_data": "竖屏时上方状态栏的背景样式，可以定义背景图、平铺方式等。\n具体请网上搜索\"css background\"了解写法。\n如果弄一张图片作为背景图，推荐写法：\n\"url(project/images/XXX.png) 0 0/100% 100% no-repeat\"\n图片最好进行一些压缩等操作节省流量。"
}, },
"toolsBackground": { "toolsBackground": {
"_leaf": true, "_leaf": true,
"_type": "textarea", "_type": "textarea",
"_data": "竖屏时下方道具栏的背景样式，可以定义背景图、平铺方式等。\n具体请网上搜索\"css background\"了解写法。\n如果弄一张图片作为背景图，推荐写法：\n\"url(project/images/XXX.png) 0 0/100% 100% no-repeat\"" "_data": "竖屏时下方道具栏的背景样式，可以定义背景图、平铺方式等。\n具体请网上搜索\"css background\"了解写法。\n如果弄一张图片作为背景图，推荐写法：\n\"url(project/images/XXX.png) 0 0/100% 100% no-repeat\"\n图片最好进行一些压缩等操作节省流量。"
}, },
} }
}, },

8
libs/items.js
View File

@ -32,9 +32,11 @@ items.prototype.getItemEffect = function(itemId, itemNum) {
////// “即捡即用类”道具的文字提示 ////// ////// “即捡即用类”道具的文字提示 //////
items.prototype.getItemEffectTip = function(itemId) { items.prototype.getItemEffectTip = function(itemId) {
var ratio = parseInt(core.floors[core.status.floorId].item_ratio) || 1; var itemCls = core.material.items[itemId].cls;
if (itemId in this.itemEffectTip && (!this.items[itemId].isEquipment || !core.flags.equipment)) { // 消耗品
return eval(this.itemEffectTip[itemId]); if (itemCls === 'items') {
var ratio = parseInt(core.floors[core.status.floorId].item_ratio) || 1;
if (itemId in this.itemEffectTip) return eval(this.itemEffectTip[itemId])||"";
} }
return ""; return "";
} }

2
libs/ui.js
View File

@ -1513,7 +1513,7 @@ ui.prototype.drawToolbox = function(index) {
if (core.isset(selectId)) { if (core.isset(selectId)) {
var item=core.material.items[selectId]; var item=core.material.items[selectId];
core.fillText('ui', item.name, 10, 32, '#FFD700', "bold 20px Verdana") core.fillText('ui', item.name, 10, 32, '#FFD700', "bold 20px Verdana")
core.fillText('ui', item.text, 10, 62, '#FFFFFF', '17px Verdana'); core.fillText('ui', item.text||"该道具暂无描述。", 10, 62, '#FFFFFF', '17px Verdana');
core.fillText('ui', '<继续点击该道具即可进行使用>', 10, 89, '#CCCCCC', '14px Verdana'); core.fillText('ui', '<继续点击该道具即可进行使用>', 10, 89, '#CCCCCC', '14px Verdana');
} }

10
project/items.js
View File

@ -48,61 +48,51 @@ items_296f5d02_12fd_4166_a7c1_b5e830c9ee3a =
"sword1": { "sword1": {
"cls": "items", "cls": "items",
"name": "铁剑", "name": "铁剑",
"isEquipment": true,
"text": "一把很普通的铁剑" "text": "一把很普通的铁剑"
}, },
"sword2": { "sword2": {
"cls": "items", "cls": "items",
"name": "银剑", "name": "银剑",
"isEquipment": true,
"text": "一把很普通的银剑" "text": "一把很普通的银剑"
}, },
"sword3": { "sword3": {
"cls": "items", "cls": "items",
"name": "骑士剑", "name": "骑士剑",
"isEquipment": true,
"text": "一把很普通的骑士剑" "text": "一把很普通的骑士剑"
}, },
"sword4": { "sword4": {
"cls": "items", "cls": "items",
"name": "圣剑", "name": "圣剑",
"isEquipment": true,
"text": "一把很普通的圣剑" "text": "一把很普通的圣剑"
}, },
"sword5": { "sword5": {
"cls": "items", "cls": "items",
"name": "神圣剑", "name": "神圣剑",
"isEquipment": true,
"text": "一把很普通的神圣剑" "text": "一把很普通的神圣剑"
}, },
"shield1": { "shield1": {
"cls": "items", "cls": "items",
"name": "铁盾", "name": "铁盾",
"isEquipment": true,
"text": "一个很普通的铁盾" "text": "一个很普通的铁盾"
}, },
"shield2": { "shield2": {
"cls": "items", "cls": "items",
"name": "银盾", "name": "银盾",
"isEquipment": true,
"text": "一个很普通的银盾" "text": "一个很普通的银盾"
}, },
"shield3": { "shield3": {
"cls": "items", "cls": "items",
"name": "骑士盾", "name": "骑士盾",
"isEquipment": true,
"text": "一个很普通的骑士盾" "text": "一个很普通的骑士盾"
}, },
"shield4": { "shield4": {
"cls": "items", "cls": "items",
"name": "圣盾", "name": "圣盾",
"isEquipment": true,
"text": "一个很普通的圣盾" "text": "一个很普通的圣盾"
}, },
"shield5": { "shield5": {
"cls": "items", "cls": "items",
"name": "神圣盾", "name": "神圣盾",
"isEquipment": true,
"text": "一个很普通的神圣盾" "text": "一个很普通的神圣盾"
}, },
"superPotion": { "superPotion": {

2
更新说明.txt
View File

@ -10,7 +10,7 @@
事件：设置BGM音量 √ 事件：设置BGM音量 √
提供core.rand()和core.rand2()两个随机数函数 √ 提供core.rand()和core.rand2()两个随机数函数 √
作弊处理 √ 作弊处理 √
状态栏绘制 状态栏绘制 √
六倍速播放 √ 六倍速播放 √
播放视频时可以C键查看怪物手册 √ 播放视频时可以C键查看怪物手册 √
修复标题文字太长导致无法开始游戏的问题 √ 修复标题文字太长导致无法开始游戏的问题 √