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 |