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
PC-202302260912\Administrator
0ca224a599
乌索普添加
2023-09-20 18:06:04 +08:00
xiejun
88740201b3
排行榜UI
2023-09-20 18:00:40 +08:00
xiejun
5c4e04a1be
修改代码
2023-09-19 18:56:46 +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
51003c0c8c
灵兽升星修改
2023-09-15 15:15:11 +08:00
wangzhenxing
a6c2a99bbb
玩家信息预设修改
2023-09-15 14:58:13 +08:00
wangzhenxing
e3a8cd725f
合并冲突提交
2023-09-15 14:24:03 +08:00
wangzhenxing
14ce1fedbd
时空神将推荐阵容显示修改提交
...
(cherry picked from commit 883f9af02e
)
2023-09-15 14:18:47 +08:00
wangzhenxing
51dc91cbda
[战斗]=======================效果162 提交
...
(cherry picked from commit 56736a3aca
)
2023-09-15 14:18:14 +08:00
PC-202302260912\Administrator
739e495a60
罗杰相关
2023-09-12 16:19:20 +08:00
PC-202302260912\Administrator
d6aa6d2c90
添加模型
2023-09-12 14:35:12 +08:00
PC-202302260912\Administrator
72f8c9a5c7
漏一个
2023-09-12 14:22:03 +08:00
PC-202302260912\Administrator
68de6e2686
上传模型相关
2023-09-12 14:20:46 +08:00
PC-202302260912\Administrator
7ac17afab4
上传
2023-09-12 14:18:19 +08:00
PC-202302260912\Administrator
1811bde7d9
乌尔基
2023-09-12 14:16:26 +08:00
PC-202302260912\Administrator
ce772773cc
上传模型
2023-09-12 14:12:31 +08:00
xiejun
ccb0cd4838
修改混乱之后角色不行动的BUG
2023-09-11 17:59:32 +08:00
PC-202302260912\Administrator
b7c638b8b7
图标修改
2023-09-08 17:26:39 +08:00
DESKTOP-RH64908\Administrator
c6ff76f0f0
Merge branch 'dev_oneDis' into dev_one_discount
2023-09-08 15:32:40 +08:00
wangzhenxing
b2e7822bf1
【战斗】===============效果10修改提交
2023-09-08 14:09:13 +08:00
DESKTOP-RH64908\Administrator
47a5749423
Merge branch 'dev_oneDis' into dev_one_discount
2023-09-06 17:09:14 +08:00
wangzhenxing
4b34e64de7
工会开启 工会技能
2023-09-06 15:11:01 +08:00
wangzhenxing
6085b2193a
多对塔挑战修改
2023-09-06 14:43:33 +08:00
DESKTOP-RH64908\Administrator
633f716e0f
Merge branch 'dev_oneDis' into dev_one_discount
2023-09-06 10:35:42 +08:00
wangzhenxing
fdae5c1348
嘲讽图标修改
2023-09-06 10:31:10 +08:00
DESKTOP-RH64908\Administrator
6bddc7e935
Merge branch 'dev_oneDis' into dev_one_discount
2023-09-05 21:05:57 +08:00
wangzhenxing
5314b7ccf6
添加嘲讽图标
2023-09-05 20:59:52 +08:00
DESKTOP-RH64908\Administrator
3e7c0cc1aa
Merge branch 'dev_oneDis' into dev_one_discount
2023-09-05 15:18:02 +08:00
wangzhenxing
db98c5dd91
Merge branch 'dev_oneDis' of http://192.168.1.21:3000/root/miduo_client into dev_oneDis
...
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
2023-09-05 15:04:26 +08:00
PC-202302260912\Administrator
99bf06bd3b
魂印狂欢图标
2023-09-07 14:51:19 +08:00
wangzhenxing
2a5188a8fc
协议提交
2023-09-05 14:55:38 +08:00
PC-202302260912\Administrator
253858dfba
黄猿图片
2023-09-04 21:39:41 +08:00
PC-202302260912\Administrator
d2f39af497
阿龙上传
2023-09-04 20:10:53 +08:00
wangzhenxing
db3b8d9562
【战斗】====================被动添加479
2023-09-04 18:45:16 +08:00
xiejun
363b5a3818
图鉴UI
2023-09-04 18:27:40 +08:00
wangzhenxing
c889e67a43
英雄属性详情界面去除工会技能跳转
2023-09-04 16:57:01 +08:00
xiejun
731ca32f5b
修改BUG
2023-09-04 15:40:11 +08:00
xiejun
3993a248c0
修改bUG
2023-09-04 15:21:09 +08:00
PC-202302260912\Administrator
fcf92fcc50
添加动作
2023-09-04 14:51:27 +08:00
PC-202302260912\Administrator
d73b462e1d
上传美术资源
2023-09-04 14:00:24 +08:00
PC-202302260912\Administrator
4bfa80709f
修正头像
2023-09-02 19:17:32 +08:00
xiejun
87bd10593d
工会
2023-09-02 18:59:49 +08:00
xiejun
3ab79a59b7
副本UI
2023-09-02 18:53:21 +08:00
xiejun
c6d6e21e57
修改
2023-09-02 18:04:06 +08:00
xiejun
0a3533dbfe
挑战副本
2023-09-02 17:17:15 +08:00
xiejun
5b8ef487f7
御灵
2023-09-02 17:16:34 +08:00
PC-202302260912\Administrator
f4e90a59c4
新增图片
2023-09-02 16:12:34 +08:00