Commit Graph

1400 Commits (37508d244d04c7eb7568ac4f732a0e9f0a7a37a5)

Author SHA1 Message Date
wangzhenxing 76105dd37c 圣器信息界面修改 2024-01-24 16:32:52 +08:00
wangzhenxing 6627a29ea0 鸿蒙守卫修改 2024-01-22 18:09:56 +08:00
wangzhenxing 3079280262 罗浮争锋名称修改 2024-01-22 18:01:26 +08:00
wangzhenxing ce851d5793 副本名称修改 2024-01-22 17:51:31 +08:00
wangzhenxing d5c5dc0bd5 神印穿戴提示修改 2024-01-22 17:42:38 +08:00
wangzhenxing c63ade0716 限时抽卡修改 2024-01-22 14:35:08 +08:00
wangzhenxing 0144aec42f 多对塔修改 2024-01-20 22:28:22 +08:00
wangzhenxing ca956709f6 鸿蒙阵提示修改 2024-01-20 20:41:38 +08:00
wangzhenxing 1d076edb55 鸿蒙阵文字提示修改 2024-01-20 20:36:30 +08:00
wangzhenxing 6a053ea36f 副本排行榜描述修改 2024-01-20 20:26:09 +08:00
wangzhenxing 8c23bda07e 手环挂件提示修改 2024-01-20 16:28:06 +08:00
wangzhenxing 6234451f53 文字提示修改 2024-01-20 16:19:58 +08:00
wangzhenxing e68db0f718 Merge branch 'onepiece_demo' of http://192.168.1.21:3000/root/miduo_client into onepiece_demo 2024-01-20 16:09:14 +08:00
wangzhenxing 00a65a7dd5 英雄升星界面修改 2024-01-20 16:08:48 +08:00
xiejun ac384ba7fc 修改底部图标 2024-01-20 16:01:31 +08:00
wangzhenxing bee811ac69 提示修改 2024-01-20 14:35:48 +08:00
xiejun 0835db8dde 四海历练预制体修改 2024-01-18 21:41:21 +08:00
wangzhenxing e8eb3bc4b9 圣器分解提示文字修改 2024-01-18 21:24:02 +08:00
wangzhenxing 40fbef5b31 英雄信息界面修改 2024-01-18 16:25:36 +08:00
xiejun 0bfd2f7325 灵兽换成圣器 2024-01-18 14:47:42 +08:00
wangzhenxing a29bc59799 海上寻宝修改 2024-01-17 18:40:19 +08:00
wangzhenxing a929fb7e40 伤害防御副本修改提交 2024-01-17 18:00:34 +08:00
wangzhenxing 59796d72df 神兵改成名刀 2024-01-16 17:02:06 +08:00
xiejun aca20158a8 奥义卡UI修改(差一张虚位以待) 2024-01-16 14:10:04 +08:00
xiejun ff7b2df764 修改技能类型描述底图以及文本 2024-01-15 10:59:00 +08:00
xiejun 57f186b792 回调 2024-01-12 15:49:23 +08:00
xiejun 5345dec3f6 修改自选道具栏的逻辑 2024-01-11 19:11:21 +08:00
wangzhenxing fe86bacd77 [礼物]======礼物升星提交 2024-01-10 18:12:31 +08:00
wangzhenxing 5f02db7c62 工会挑战副本修改 2024-01-10 15:54:50 +08:00
xiejun c6b189c443 修改武器室品质色底图 2024-01-09 19:01:36 +08:00
wangzhenxing 030431e3fc 合并0.1新功能修改 2024-01-03 15:24:49 +08:00
xiejun bf04c23bad 文字飘字 2023-12-29 23:53:05 +08:00
xiejun 56be2d2498 文字 2023-12-29 18:07:20 +08:00
wangzhenxing 7651474b75 Merge branch 'onepiece_demo' of http://192.168.1.21:3000/root/miduo_client into onepiece_demo 2023-12-28 13:33:12 +08:00
wangzhenxing 6919d8d83e global修改提交 2023-12-28 13:33:07 +08:00
xiejun 1b8a1a2480 bug修改 2023-12-27 19:05:37 +08:00
wangzhenxing 8476f67c95 function星级显示修改 2023-12-15 11:35:44 +08:00
xiejun 52726874dd 四海历练相关 2023-12-08 23:57:58 +08:00
wangzhenxing a2d7a8b733 备战界面修改 2023-12-08 23:02:10 +08:00
wangzhenxing 63e9a01c73 法宝改成生命卡 2023-12-08 21:57:53 +08:00
xiejun 71140a84d7 特训BUG 2023-12-08 11:23:14 +08:00
wangzhenxing c3334a5d98 更换名称 2023-12-07 01:11:27 +08:00
wangzhenxing e4299072f4 名称替换 2023-12-07 00:09:44 +08:00
xiejun ba7840359e 四海历练title修改 2023-12-06 19:18:19 +08:00
wangzhenxing 80df51683c 名刀技能描述修改 称号修改 2023-12-06 16:58:51 +08:00
xiejun b9d5a38850 特训UI修改 2023-11-30 15:23:29 +08:00
xiejun 4e6e0f29bd 角色特训 2023-11-28 21:31:01 +08:00
wangzhenxing 5210074f75 英雄升级信息显示修改 2023-11-28 13:57:33 +08:00
wangzhenxing b609eeb97c 特训添加帮助 2023-11-24 18:54:39 +08:00
wangzhenxing db821399a1 特训建筑提交 2023-11-22 19:20:42 +08:00
wangzhenxing 77adfa025a 特训表提交 2023-11-17 17:41:45 +08:00
wangzhenxing 68efafbdfe 魂印修改 2023-11-16 11:45:30 +08:00
wangzhenxing 96d0a857c9 英雄信息展示界面修改 2023-11-15 16:42:13 +08:00
xiejun ca41622f5d 十绝阵奖励弹窗和好友底部按钮选中字色问题 2023-11-15 15:53:16 +08:00
wangzhenxing 4e04803971 多对塔修改 2023-11-14 18:34:01 +08:00
xiejun 07e72f4829 修改ExpeditionMonsterInfoPopup预制体 2023-11-14 17:12:24 +08:00
wangzhenxing 8f4a165489 代码提交 2023-11-07 18:22:05 +08:00
wangzhenxing 220e56f8c7 英雄列表界面修改 2023-11-06 14:10:55 +08:00
xiejun 1e53fbc529 锻器阁 2023-10-31 15:30:06 +08:00
wangzhenxing d1a9cff2c5 法宝聚灵修改提交 2023-10-30 19:16:17 +08:00
wangzhenxing ed63b42413 法宝聚灵修改提交 2023-10-30 15:27:42 +08:00
wangzhenxing 0d08ea1a84 法灵提交 2023-10-26 17:16:10 +08:00
wangzhenxing c43520367a 潜能红点提交 2023-10-16 17:11:07 +08:00
wangzhenxing a66437ec72 潜能提交 2023-10-16 15:12:47 +08:00
wangzhenxing e3867bc3d7 Merge branch 'onepiece_demo' of http://192.168.1.21:3000/root/miduo_client into onepiece_demo 2023-10-14 12:20:29 +08:00
wangzhenxing 5f4494a306 潜能常量提交 2023-10-14 12:05:20 +08:00
xiejun f9adc3d4a7 排行榜和修复BUG 2023-10-13 11:24:19 +08:00
wangzhenxing bb18772265 Merge branch 'dev_oneDis' into onepiece_demo
# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleInfoPanel.prefab
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
2023-09-21 18:43:54 +08:00
wangzhenxing 083305249a 银条添加加号 2023-09-20 19:02:41 +08:00
xiejun c47462c5d8 Merge branch 'dev_one_discount' of http://192.168.1.21:3000/root/miduo_client into onepiece_demo
# Conflicts:
#	AssetBundles/version.txt
#	Assets/ManagedResources/Prefabs/UI/FightLevel/FightLevelChapterPanel.prefab
#	Assets/ManagedResources/Prefabs/UI/HandBook/HandBookHeroInfoPanel.prefab
#	Assets/ManagedResources/Prefabs/UI/ItemView/ItemView.prefab
#	Assets/ManagedResources/Prefabs/UI/Main/MainPanel.prefab
#	Assets/ManagedResources/Prefabs/UI/Popup/PlayerInfoPopup.prefab
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
#	Assets/ManagedResources/~Lua/Common/functions.lua
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
#	Assets/ManagedResources/~Lua/Message/PlayerInfoProto_pb.lua
#	Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Effect.lua
#	Assets/ManagedResources/~Lua/Modules/Carbon/DailyCarbonPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Carbon/NewCarbon/CarbonsPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Carbon/XuanYuanMirrorPanelList.lua
#	Assets/ManagedResources/~Lua/Modules/FightLevel/FightLevelChapterPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua
#	Assets/ManagedResources/~Lua/Modules/MonsterCamp/MonsterCampNewPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/TalismanInfoPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Practice/PracticeManager.lua
#	Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleTalismanPanelV2.lua
2023-09-20 18:57:44 +08:00
wangzhenxing 266c5b12af 礼物修改 点将神符不足弹出提示 2023-09-20 14:37:05 +08:00
wangzhenxing e37b4befbd 礼物显示修改 2023-09-20 11:52:31 +08:00
wangzhenxing f0919b9ce8 礼物红点提交 2023-09-20 11:28:57 +08:00
wangzhenxing 600f270128 礼物添加总属性显示,逍遥游寻仙修改 2023-09-19 18:03:00 +08:00
wangzhenxing 1556e5c6a9 礼物合成提交 2023-09-18 17:41:06 +08:00
wangzhenxing 551579ca39 星际显示添加空判断
(cherry picked from commit fd5cd6836c)
2023-09-15 18:02:50 +08:00
wangzhenxing fd5cd6836c 星际显示添加空判断 2023-09-15 18:00:39 +08:00
wangzhenxing acdb5a21cd 礼物修改提交 2023-09-15 14:11:14 +08:00
wangzhenxing eeb3859f72 礼物功能提交 2023-09-13 14:57:48 +08:00
wangzhenxing 3ac8d1ee2c 魂印图鉴修改提交 2023-09-01 18:48:59 +08:00
wangzhenxing 55f0c6d3e6 魂印图鉴修改 ,命石修改 2023-09-01 18:04:52 +08:00
wangzhenxing 2b93776f7c 命格修改提交 2023-09-01 17:36:15 +08:00
wangzhenxing 18e10b4fb6 命格修改提交 2023-08-31 19:12:02 +08:00
wangzhenxing 52393c592c 命石提交 2023-08-31 15:02:13 +08:00
xiejun 6ced2b0507 Merge branch 'dev_oneDis' into onepiece_demo
# Conflicts:
#	AssetBundles/version.txt
#	Assets/ManagedResources/Prefabs/UI/FightLevel/FightLevelChapterPanel.prefab
#	Assets/ManagedResources/Prefabs/UI/ItemView/ItemView.prefab
#	Assets/ManagedResources/Prefabs/UI/Main/MainPanel.prefab
#	Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Effect.lua
#	Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/TalismanInfoPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Practice/PracticeManager.lua
#	Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleTalismanPanelV2.lua
2023-08-29 17:58:24 +08:00
xiejun f549956ebb 新预制体已经公会和活动ui 2023-08-28 11:34:43 +08:00
xiejun 148443883c 神将 2023-08-11 19:03:48 +08:00
wangzhenxing 34834da938 心愿法宝开启文字提示修改 2023-08-08 17:21:11 +08:00
xiejun 43d80275b9 神将部分UI替换 2023-08-04 18:58:14 +08:00
wangzhenxing c32b71d3fc 变身卡无法升星修改,法宝超过10级显示修改 2023-08-02 14:46:18 +08:00
xiejun fd8329bf90 海贼UI 2023-07-27 18:37:04 +08:00
xiejun 8a4e15e258 海贼UI替换 2023-07-21 17:04:16 +08:00
PC-202302260912\Administrator 15cce82e7a 法宝抽卡添加开启限制 2023-07-17 14:27:56 +08:00
PC-202302260912\Administrator b5bcce6eab 抽卡道具显示修改 2023-07-13 17:52:56 +08:00
PC-202302260912\Administrator 18691fb97e 法宝技能信息显示修改 2023-07-11 13:48:33 +08:00
PC-202302260912\Administrator 22122de56a 心愿法宝抽卡入口改成开服n天后显示 2023-07-10 17:09:33 +08:00
PC-202302260912\Administrator 8bae77bd5b [法宝]====================法宝特性描述修改 2023-07-07 10:27:42 +08:00
PC-202302260912\Administrator 5838089889 七界试炼,灵脉秘境更换入口,日常任务副本只保留前两个
(cherry picked from commit 0646849c2f)
2023-06-28 15:50:22 +08:00
wangzhenxing 53625b9dc0 资源条去除仙晶显示 2023-06-08 14:19:46 +08:00
wangzhenxing ebfddaad60 法宝心愿修改提交 2023-06-06 15:57:53 +08:00