xiejun
|
2cc799f367
|
特训BUG修复
|
2024-01-24 19:02:06 +08:00 |
xiejun
|
7db0a04431
|
我要变强预制体替换
|
2024-01-24 18:14:51 +08:00 |
wangzhenxing
|
50bd2c87c5
|
角色获取信息修改
|
2024-01-22 20:37:25 +08:00 |
wangzhenxing
|
2e518db90e
|
信息界面修改
|
2024-01-22 19:03:40 +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
|
f50cb684b0
|
名刀回炉改成名刀重铸
|
2024-01-22 17:28:30 +08:00 |
wangzhenxing
|
2b5c469394
|
角色信息界面修改
|
2024-01-22 14:46:49 +08:00 |
wangzhenxing
|
ce4f27e7ca
|
英雄置换卡界面
|
2024-01-21 00:05:24 +08:00 |
xiejun
|
f6b43ee99b
|
四海试炼资源重叠
|
2024-01-20 21:38:09 +08:00 |
wangzhenxing
|
65f8ce53d1
|
多对塔修改
|
2024-01-20 21:26:38 +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
|
f2c3cfa8bf
|
图鉴预设修改提交
|
2024-01-20 14:21:47 +08:00 |
wangzhenxing
|
dc60d0a164
|
屏蔽我要变强界面
|
2024-01-19 18:22:18 +08:00 |
wangzhenxing
|
3a7f3fb6ba
|
灵兽名称修改
|
2024-01-18 21:27:53 +08:00 |
wangzhenxing
|
40fbef5b31
|
英雄信息界面修改
|
2024-01-18 16:25:36 +08:00 |
wangzhenxing
|
260f818bba
|
霸气 神印详情修改
|
2024-01-17 11:47:52 +08:00 |
wangzhenxing
|
eb157d8b24
|
角色信息界面修改
|
2024-01-17 11:21:50 +08:00 |
xiejun
|
cabb20095f
|
生命卡
|
2024-01-16 18:32:53 +08:00 |
wangzhenxing
|
9b20642e9d
|
名刀分解修改
|
2024-01-16 17:22:15 +08:00 |
wangzhenxing
|
59796d72df
|
神兵改成名刀
|
2024-01-16 17:02:06 +08:00 |
wangzhenxing
|
9dcd29e6a3
|
法相详情修改提交
|
2024-01-16 16:47:24 +08:00 |
wangzhenxing
|
7a232cc185
|
生命卡修改提交
|
2024-01-16 11:21:17 +08:00 |
wangzhenxing
|
06a1b0ea97
|
四海试炼上阵界面修改
|
2024-01-15 19:11:29 +08:00 |
wangzhenxing
|
3b06a6aede
|
法相详情界面修改提交
|
2024-01-15 17:01:46 +08:00 |
wangzhenxing
|
9dc40bc57e
|
玩家详情界面修改
|
2024-01-15 16:59:11 +08:00 |
wangzhenxing
|
d0232e9a98
|
变身卡描述修改
|
2024-01-15 15:26:42 +08:00 |
xiejun
|
ff7b2df764
|
修改技能类型描述底图以及文本
|
2024-01-15 10:59:00 +08:00 |
xiejun
|
21778eb1a9
|
修改预制体
|
2024-01-13 16:57:52 +08:00 |
wangzhenxing
|
73d2f0afb5
|
命石修改提交
|
2024-01-13 15:19:58 +08:00 |
wangzhenxing
|
3f2322eeb0
|
英雄信息界面显示修改
|
2024-01-12 15:48:14 +08:00 |
wangzhenxing
|
d4f3373706
|
霸气图鉴修改提交
|
2024-01-11 10:37:43 +08:00 |
wangzhenxing
|
fe86bacd77
|
[礼物]======礼物升星提交
|
2024-01-10 18:12:31 +08:00 |
wangzhenxing
|
1d584c8d68
|
Merge branch 'onepiece_demo' into onepiece_demo_dev
|
2024-01-04 11:27:30 +08:00 |
xiejun
|
5c9d0f8487
|
修改点石成金BUG
|
2024-01-03 15:56:51 +08:00 |
wangzhenxing
|
030431e3fc
|
合并0.1新功能修改
|
2024-01-03 15:24:49 +08:00 |
wangzhenxing
|
654eb531b5
|
礼物修改提交
|
2024-01-02 18:16:56 +08:00 |
xiejun
|
40969c7944
|
角色情报技能显示特训联动被动
|
2023-12-22 10:39:39 +08:00 |
xiejun
|
6ca07f6730
|
特训联动被动
|
2023-12-20 17:57:17 +08:00 |
wangzhenxing
|
488555c39c
|
抽卡英雄展示修改
|
2023-12-11 18:40:38 +08:00 |
wangzhenxing
|
63e9a01c73
|
法宝改成生命卡
|
2023-12-08 21:57:53 +08:00 |
wangzhenxing
|
c3334a5d98
|
更换名称
|
2023-12-07 01:11:27 +08:00 |
wangzhenxing
|
e4299072f4
|
名称替换
|
2023-12-07 00:09:44 +08:00 |
wangzhenxing
|
80df51683c
|
名刀技能描述修改 称号修改
|
2023-12-06 16:58:51 +08:00 |
PC-202302260912\Administrator
|
8d2c728a84
|
奖励物品展示修改提交
(cherry picked from commit bc3f82e874)
|
2023-12-06 15:20:01 +08:00 |
wangzhenxing
|
722476d6f1
|
角色信息修改提交
|
2023-12-05 15:59:32 +08:00 |
xiejun
|
39ecf196a2
|
日常报错
|
2023-12-05 14:06:35 +08:00 |
xiejun
|
4732f007ce
|
归元字体修改
|
2023-12-04 18:21:04 +08:00 |
xiejun
|
b7b5ad6c72
|
起名的ui替换
|
2023-12-01 17:41:01 +08:00 |
xiejun
|
bacab5b38b
|
特训修改
|
2023-11-29 17:00:29 +08:00 |
xiejun
|
b02b37beaf
|
归元相关代码修改
|
2023-11-20 17:37:43 +08:00 |
wangzhenxing
|
68efafbdfe
|
魂印修改
|
2023-11-16 11:45:30 +08:00 |
wangzhenxing
|
96d0a857c9
|
英雄信息展示界面修改
|
2023-11-15 16:42:13 +08:00 |
wangzhenxing
|
49cc691cbb
|
战斗结束打开回放按钮
|
2023-11-14 14:09:22 +08:00 |
wangzhenxing
|
d5ed3cf71b
|
战斗修改 我要变强,战斗伤害记录入口屏蔽
|
2023-11-13 18:28:01 +08:00 |
xiejun
|
f49e326c83
|
战斗的胜败,首领信息,最佳mvp等界面
|
2023-11-12 16:24:40 +08:00 |
wangzhenxing
|
b00f874236
|
点石成金修改提交
|
2023-11-09 10:52:24 +08:00 |
wangzhenxing
|
d9722c0f9f
|
活动界面显示修改
|
2023-11-08 16:57:26 +08:00 |
wangzhenxing
|
f335977a4b
|
装备详情界面修改
|
2023-11-07 15:56:30 +08:00 |
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 |