xiejun
|
f9adc3d4a7
|
排行榜和修复BUG
|
2023-10-13 11:24:19 +08:00 |
PC-202302260912\Administrator
|
6c6ce67bc3
|
第二波
|
2023-10-12 17:52:18 +08:00 |
PC-202302260912\Administrator
|
54837f83b2
|
模型上传第一波
|
2023-10-12 17:49:35 +08:00 |
PC-202302260912\Administrator
|
975da0144f
|
小兵1相关
|
2023-10-11 14:42:47 +08:00 |
wangzhenxing
|
546e6d4627
|
主城屏蔽鸿蒙阵入口,英雄属性信息去掉公会技能入口
|
2023-10-11 11:24:32 +08:00 |
xiejun
|
ff21cd74d2
|
竞技场部分预制体修改
|
2023-10-10 18:53:44 +08:00 |
wangzhenxing
|
fff8911f19
|
英雄信息界面预设修改
|
2023-10-10 10:29:23 +08:00 |
xiejun
|
44087689d4
|
灵兽
|
2023-10-08 16:53:34 +08:00 |
xiejun
|
eb926fc087
|
灵兽
|
2023-09-28 17:05:40 +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
|
e93a0dbf49
|
Merge branch 'dev_oneDis' into onepiece_demo
|
2023-09-28 15:49:22 +08:00 |
wangzhenxing
|
49bf0b384a
|
[战斗]=============被动480修改
|
2023-09-26 16:21:41 +08:00 |
wangzhenxing
|
fd00808d2d
|
Merge branch 'dev_oneDis' into onepiece_demo
|
2023-09-25 10:50:09 +08:00 |
wangzhenxing
|
3dfc21e7b9
|
[战斗]=======================被动添加480 481
|
2023-09-25 10:49:27 +08:00 |
PC-202302260912\Administrator
|
7691b7913b
|
乌索普相关
|
2023-09-22 13:22:22 +08:00 |
wangzhenxing
|
db71c4df20
|
神将主界面修改
|
2023-09-21 18:58:21 +08:00 |
wangzhenxing
|
40b132d6be
|
场景修改提交
|
2023-09-21 18:45:34 +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
|
d53329f6fb
|
灵兽部分UI
|
2023-09-21 18:36:44 +08:00 |
wangzhenxing
|
4ca9009932
|
逍遥游修改
|
2023-09-21 17:13:03 +08:00 |
xiejun
|
b6bf5409f1
|
修改合并后的bug
|
2023-09-21 17:04:24 +08:00 |
wangzhenxing
|
b0650bbb20
|
主角礼物显示修改
|
2023-09-21 16:41:59 +08:00 |
wangzhenxing
|
76c7acf061
|
礼物item显示修改
|
2023-09-21 15:36:17 +08:00 |
wangzhenxing
|
97fc7811be
|
英雄礼物显示修改
|
2023-09-21 15:18:13 +08:00 |
wangzhenxing
|
f2e064faf3
|
易经宝库修改
|
2023-09-21 15:17:39 +08:00 |
wangzhenxing
|
083305249a
|
银条添加加号
|
2023-09-20 19:02:41 +08:00 |
xiejun
|
253e73f8a4
|
Merge branch 'onepiece_demo' of http://192.168.1.21:3000/root/miduo_client into onepiece_demo
|
2023-09-20 18:58:27 +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
|
33419ff012
|
[战斗]====================效果添加163 164
|
2023-09-20 18:42:20 +08:00 |
PC-202302260912\Administrator
|
0ca224a599
|
乌索普添加
|
2023-09-20 18:06:04 +08:00 |
xiejun
|
88740201b3
|
排行榜UI
|
2023-09-20 18:00:40 +08:00 |
wangzhenxing
|
ff5bcbced9
|
礼物合成显示秀嘎,添加礼物商店跳转
|
2023-09-20 17:40:33 +08:00 |
PC-202302260912\Administrator
|
2ffaa9e7d5
|
银锭旋转
|
2023-09-20 17:17:36 +08:00 |
wangzhenxing
|
a9150906de
|
礼物红点修改提交
|
2023-09-20 16:55:15 +08:00 |
wangzhenxing
|
b8a15b703b
|
礼物特效层级修改提交
|
2023-09-20 16:33:01 +08:00 |
wangzhenxing
|
5f6d51786d
|
礼物显示修改
|
2023-09-20 15:41:36 +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 |
xiejun
|
5c4e04a1be
|
修改代码
|
2023-09-19 18:56:46 +08:00 |
wangzhenxing
|
bb1ea1c7f8
|
[战斗]=======================添加主角连击逻辑
|
2023-09-19 18:49:29 +08:00 |
wangzhenxing
|
600f270128
|
礼物添加总属性显示,逍遥游寻仙修改
|
2023-09-19 18:03:00 +08:00 |
wangzhenxing
|
c99a7bf4b3
|
Merge branch 'dev_one_discount' into dev_oneDis
|
2023-09-18 17:42:34 +08:00 |
wangzhenxing
|
1556e5c6a9
|
礼物合成提交
|
2023-09-18 17:41:06 +08:00 |
xiejun
|
af6b341a0c
|
修改子弹逻辑
|
2023-09-18 15:41:32 +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
|
e7a19ce338
|
灵兽升星修改
(cherry picked from commit 51003c0c8c )
|
2023-09-15 15:39:11 +08:00 |
wangzhenxing
|
c037d9a2a2
|
玩家信息预设修改
(cherry picked from commit a6c2a99bbb )
|
2023-09-15 15:38:55 +08:00 |