Commit Graph

1163 Commits (793daedcb4756ff66b8477ef902d672375d8fab3)

Author SHA1 Message Date
wangzhenxing 793daedcb4 英雄列表阵容显示修改 2023-11-06 14:55:59 +08:00
wangzhenxing 0ec0ccc6b2 玩家界面修改提交 2023-11-03 18:43:17 +08:00
wangzhenxing dd9444c745 屏蔽英雄觉醒显示 2023-10-27 17:09:16 +08:00
wangzhenxing 1c65cd4052 法灵修改 2023-10-27 16:16:37 +08:00
wangzhenxing e795b4834b 法灵红点提交 2023-10-27 14:10:43 +08:00
wangzhenxing ed4865cc3c 法宝星级显示修改 2023-10-26 20:44:18 +08:00
wangzhenxing 0d08ea1a84 法灵提交 2023-10-26 17:16:10 +08:00
xiejun 663fbca133 神兵热榜 2023-10-24 20:02:38 +08:00
wangzhenxing 64d5426397 装备=============套装属性 技能显示修改 2023-10-17 15:47:10 +08:00
wangzhenxing a66437ec72 潜能提交 2023-10-16 15:12:47 +08:00
wangzhenxing de562386e0 Merge branch 'dev_oneDis' into onepiece_demo
# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/Popup/PlayerInfoPopup.prefab
2023-09-28 16:01:34 +08:00
wangzhenxing 1e1fd36489 玩家信息界面修改 2023-09-28 16:00:26 +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
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 600f270128 礼物添加总属性显示,逍遥游寻仙修改 2023-09-19 18:03:00 +08:00
wangzhenxing e3a8cd725f 合并冲突提交 2023-09-15 14:24:03 +08:00
wangzhenxing acdb5a21cd 礼物修改提交 2023-09-15 14:11:14 +08:00
wangzhenxing 049cebd574 灵兽星际显示修改提交 2023-09-15 13:56:38 +08:00
wangzhenxing e80056fcd4 查看礼物信息提交 2023-09-13 15:44:06 +08:00
wangzhenxing eeb3859f72 礼物功能提交 2023-09-13 14:57:48 +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
wangzhenxing a2ed294523 英雄信息界面变身卡星级显示修改 2023-08-16 11:36:58 +08:00
xiejun 148443883c 神将 2023-08-11 19:03:48 +08:00
wangzhenxing 59c75221b0 七界秘宝开启奖励显示修改 2023-08-07 15:47: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
PC-202302260912\Administrator 2987bc24a2 心魔试炼=================屏蔽神应显示 2023-07-14 11:24:26 +08:00
PC-202302260912\Administrator de3f2d011a 心愿宝箱奖励排序修改 2023-07-10 18:56:20 +08:00
PC-202302260912\Administrator 8bae77bd5b [法宝]====================法宝特性描述修改 2023-07-07 10:27:42 +08:00
PC-202302260912\Administrator 65f0eac110 法宝25级特性显示修改 2023-07-06 16:28:19 +08:00
PC-202302260912\Administrator 795c3e52f0 心願抽卡修改提交 2023-06-13 18:46:34 +08:00
wangzhenxing d1c46a2b4e 心愿奖励预览提交 2023-06-07 11:36:53 +08:00
wangzhenxing ebfddaad60 法宝心愿修改提交 2023-06-06 15:57:53 +08:00
yuanshuai d4a971e087 Merge branch 'china/dev_bt_develop' into china/dev_bt
# Conflicts:
#	Assets/ManagedResources/~Lua/Modules/Popup/HomeLandEquipPopup.lua
2023-05-08 17:42:35 +08:00
yuanshuai b02ebc8b22 摘星阁bug修改 2023-05-08 17:27:12 +08:00
yuanshuai 9f4109c16f 七界试炼bug修复 2023-05-08 15:00:52 +08:00
wangzhenxing 35ee3bdf48 摘星阁修改 2023-04-23 15:23:41 +08:00
wangzhenxing 7758ec6d8d 法宝自选箱,宝物添加时空选项 2023-04-21 10:50:09 +08:00
wangzhenxing 5999c18900 新英雄上阵修改提交 2023-04-18 15:34:22 +08:00
wangzhenxing 3f8a00cb14 [神兵]==================修改提交 2023-04-11 14:41:36 +08:00
yuanshuai a7ccff7ff1 神兵功能优化 2023-04-06 18:13:54 +08:00
wangzhenxing 12e2cecaa1 神兵属性,神兵羁绊,神兵分解提交 2023-04-04 11:15:32 +08:00
wangzhenxing a753de6a59 神兵技能信息预设修改提交 2023-03-30 13:11:09 +08:00
wangzhenxing 207c1f3426 神兵信息弹窗修改提交 2023-03-29 17:21:33 +08:00
wangzhenxing 10fee38b64 神兵提交 2023-03-29 10:48:35 +08:00
wangzhenxing 826f58ce6e 神兵提交 2023-03-28 13:57:59 +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