Commit Graph

971 Commits (30cc0087d17f9ab05116cd418afa5903982457e6)

Author SHA1 Message Date
xiejun 52726874dd 四海历练相关 2023-12-08 23:57:58 +08:00
wangzhenxing 63e9a01c73 法宝改成生命卡 2023-12-08 21:57:53 +08:00
xiejun 71140a84d7 特训BUG 2023-12-08 11:23:14 +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 4e6e0f29bd 角色特训 2023-11-28 21:31:01 +08:00
wangzhenxing b609eeb97c 特训添加帮助 2023-11-24 18:54:39 +08:00
wangzhenxing db821399a1 特训建筑提交 2023-11-22 19:20:42 +08:00
wangzhenxing 68efafbdfe 魂印修改 2023-11-16 11:45:30 +08:00
wangzhenxing 8f4a165489 代码提交 2023-11-07 18:22:05 +08:00
wangzhenxing 220e56f8c7 英雄列表界面修改 2023-11-06 14:10:55 +08:00
wangzhenxing d1a9cff2c5 法宝聚灵修改提交 2023-10-30 19:16:17 +08:00
wangzhenxing ed63b42413 法宝聚灵修改提交 2023-10-30 15:27:42 +08:00
wangzhenxing c43520367a 潜能红点提交 2023-10-16 17:11:07 +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 eeb3859f72 礼物功能提交 2023-09-13 14:57:48 +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
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 148443883c 神将 2023-08-11 19:03:48 +08:00
xiejun 43d80275b9 神将部分UI替换 2023-08-04 18:58:14 +08:00
PC-202302260912\Administrator b5bcce6eab 抽卡道具显示修改 2023-07-13 17:52:56 +08:00
PC-202302260912\Administrator 22122de56a 心愿法宝抽卡入口改成开服n天后显示 2023-07-10 17:09:33 +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
wangzhenxing ac172339ae 心愿抽卡修改提交 2023-05-27 19:04:30 +08:00
wangzhenxing 1f94c3d234 变身卡添加职业 2023-04-21 13:24:26 +08:00
wangzhenxing 3f8a00cb14 [神兵]==================修改提交 2023-04-11 14:41:36 +08:00
yuanshuai 0b3e5511b2 神兵帮助 2023-04-07 11:13:15 +08:00
yuanshuai a7ccff7ff1 神兵功能优化 2023-04-06 18:13:54 +08:00
yuanshuai 31f51cca80 神兵红点提交 2023-04-04 18:21:14 +08:00
wangzhenxing 12e2cecaa1 神兵属性,神兵羁绊,神兵分解提交 2023-04-04 11:15:32 +08:00
yuanshuai a176bca619 神兵相关修改提交 2023-03-31 17:52:12 +08:00
wangzhenxing c370823e04 神兵常量提交 2023-03-24 11:08:03 +08:00
wangzhenxing 04a84da290 多队塔红点提交 2023-03-22 14:58:19 +08:00
wangzhenxing 91b1bbb82c 遴选多队塔代码 2023-03-21 10:58:00 +08:00
wangzhenxing 6d55ae95d7 Revert "多队塔提交"
This reverts commit 4a411833a5.
2023-03-20 11:42:40 +08:00